removed p01/p02 checks