updated switches