Add similar changes to P2