refactoring v.2