Swap improvements

Quick Reply