Adjusted some variables, and referted combination code