fixing with the classes