Made category stuff work better