Added solutions to p1 and p2