Add checks for grading