Adding more switches