switched some controllers