switch feature now configurable