More GRADER updates