Added on/off switch