Expanded grade and and borough classes to include cockroach numbers