added new p2p,p2b x original conditions.