Updated  checks and grader