Added Input Switches