refactoring update 2