My final edits to GRADER