Simplified hotswap