deviceswap changes