Added eventhandlers for second switch