added a "switch"