Updated with new features added to the project