Finish P2 c and d