My version of the project without