updated switches and section