P2Pv2 Upgrade