Swap YACHT to XPR on XPR