More PEPifying