Final grader
bug fix for grader
ok