changes for p1 and p97