changes in HardwareSwap