Changed the classes