PEP improvements