Even more changes to grading logic