Several changes to the project