working on the switch