better handling of turning inputs on/off