add more switches