Improved Combo Logic