Moved p2 & p3 to root