Revert "Revert "switch 3""

This reverts commit fc3d4ed33cd5df71521e81ac903e671cc2c00316.