Fixed up the switch controller