updated for enabled/disabled switch