Fixed index and added grader