Added initial grader logic