Working refactored compound
Closer to PP