Swap XPR to YACHT on XPR