moved the enable/disable stuff around