changed on/off to a switch