Now the class is in the right place