Fixed the classes