Changes to grader