Took out the switch