Change P&P: current position instead of previous PVA