Completed p5 and p6