added combo functionality