Improved checks and grade.