Final Competition Code Merging into master