Added Device Swap