added more checks
new grader