added combo and saving logic