faster switch added back in