Improved combo logic