added more switches