final changes for grading