Refactored P11