changes to class design