Swap YACHT to XDC on XPR