Added global on/off switch