Finished p1.6 and modified p1.5