Final modifications on the project