Reorder to make equivalent to .p version