updated categories - includes all 6