WIP for zero downtime PEP