continue to refactoring