minor updates in both P1 and P2