ON/OFF Switch Upgrade