changed direction of the refactoring