on/off switch added