added some functionality to disable stuff