added changes to grading