Updated the implementation of the project