Refactored p19