I think the current categories make perfect sense.