removed unneded p2 functions