Added a switch