Refactored
Merging