adjust class design
adjust class design