Too many switches now

Too many switches now