Added On/Off toggle feature.