1.4 finish refactoring