Final Version
Finished merge