Some PEPing, readying for overhaul.