Switch to new device common