Updated version of p2