Refactored p22