move things around to work better with categories