Extended the checks and the grader