Refactored, repurposed