fixed the classes