Fixed the grading method