Added grader stuff