class design change