Changed some things with categories