Final changes to the project