combo, controller,修改