Refactoring, part 3
Do not use
Merge
Refactoring, part 4