changes to make it easier to turn it on and off