Final working version for Milestone 2
Fix merge conflict