Updated grader and index