Reformat and add P015 and P016