Closer complience to PEP