Changed the way the switches work.