class refactor
some commit
fix conflict