Updated checks
Updated grader