Grading chapter enhancements

STUD-1211