updated switches check