swap improvements