Updated the main functionality of the project