Improved switches.