discrete switches now work