Fix: Grading method now works ok