fixed
class refactor
class refactor