Grader & Checks updated