Change the name of the class and update method for newer code, should
also improuve performance