Changed a name, and added a class