Simpler logic to category patch