Added grade criteria