Refactored p15