Introduce grading
Fix: removed a critical callback during refactor