Added a switch!