Final Changes to the project