added combo logic, hw4