refactor
bugs fixed