renamed file
Made a few small changes to facilitate switching p1 and p2