FIXUP: refactor intelligent control switches