Revised based on project refinement