Cleaning up p6 and adding p7