some further updates for grading