p1 and p2

p1 and p2 final added