added p1 and p2 blocks