Made comb. solver more efficient