refactoring new branch #2