Updated grader, checks, final version