Cleaning up
Cleaning up 2
Finishing merge