some changes to the classes