Added one-pass switch