Refactored p16