Merges Combo and ComboPro. Updates specs