Included the latest changes to the project