Added switches and final switches.