switches now work