working on grading