Updated grader and generated output