added combo calculations