Added features based grading