Second version of grader, again