re-add p2 stuff. turns out we needed it.