Updated with current status of the project