Got rid of the switchers