changes for the classes