grader and json added