Refactor
Merge conflicts