Massive PRE updates, yet again untested