Fixed P1 and P2 again. Finalized.