more changes to the classes