add Fix Class & refactor