Updated with project requirements