pulling in changes from swap-run
incorporated changes from swap-run development