Updated checks and grader