Added some additional setup & disable stuff