Updated as per rubric