Updated p2v2 to make it more readable