grader
Added additional checks