Finished changes for the project