Added ability to control wifi & data turn-offs independently