Final revision of grader.js