Replace on/off switch with yes/no where approriate