Refactoring
Conflicts...