much better handling of graded items