Work fine but upgraded to newer style