changed a bit in comboSwitch