diff --git a/qraven/modules/hydrologicproc.py b/qraven/modules/hydrologicproc.py
index 37d6db9..5245922 100644
--- a/qraven/modules/hydrologicproc.py
+++ b/qraven/modules/hydrologicproc.py
@@ -8,9 +8,13 @@ def addprocess(self):
 
     combo_proc = QComboBox() 
     combo_alg = QComboBox()
-    combo_from = QComboBox()   
+    combo_from = QComboBox()
+    combo_from2 = QComboBox() 
+    combo_from2.setEnabled(False)  
     combo_to = QComboBox()
-
+    combo_to2 = QComboBox()
+    combo_to2.setEnabled(False)
+       
     chk_isconditional = QCheckBox()
 
     combo_basedtype = QComboBox()
@@ -34,14 +38,16 @@ def addprocess(self):
     table.setCellWidget(currentRow, 0, combo_proc)  #Sets the new combobox in the first column and in the new row
     table.setCellWidget(currentRow, 1, combo_alg)
     table.setCellWidget(currentRow, 2, combo_from)
-    table.setCellWidget(currentRow, 3, combo_to)
-    table.setCellWidget(currentRow, 4, chk_isconditional)
-    table.setCellWidget(currentRow, 5, combo_basedtype)
-    table.setCellWidget(currentRow, 6, combo_comparison)
-    table.setCellWidget(currentRow, 7, txt_hrutype)
-    table.setCellWidget(currentRow, 8, chk_mixingrate)
-    table.setCellWidget(currentRow, 9, spin_pct)
-    table.setCellWidget(currentRow, 10, chk_interbasin)
+    table.setCellWidget(currentRow, 3, combo_from2)
+    table.setCellWidget(currentRow, 4, combo_to)
+    table.setCellWidget(currentRow, 5, combo_to2)
+    table.setCellWidget(currentRow, 6, chk_isconditional)
+    table.setCellWidget(currentRow, 7, combo_basedtype)
+    table.setCellWidget(currentRow, 8, combo_comparison)
+    table.setCellWidget(currentRow, 9, txt_hrutype)
+    table.setCellWidget(currentRow, 10, chk_mixingrate)
+    table.setCellWidget(currentRow, 11, spin_pct)
+    table.setCellWidget(currentRow, 12, chk_interbasin)
 
     table.resizeColumnsToContents() #Resizes the width of the column automatically
     combo_proc.currentIndexChanged.connect(lambda:setProcAlg(self,currentRow))  #Updates the algorithm combobox if the process changes
@@ -57,14 +63,17 @@ def removeprocess(self):
 def setProcAlg(self,row):
     #print('Went into the algs')
     table = self.dlg.table_hydroprocess
+    
     combo_proc = table.cellWidget(row, 0)
     combo_alg = table.cellWidget(row, 1)  #Sets the new combobox in the first column and in the new row
-    combo_from = table.cellWidget(row, 2)
-    combo_to = table.cellWidget(row, 3)
-    chk_mixingrate = table.cellWidget(row, 8)
-    spin_pct = table.cellWidget(row, 9)
-    chk_interbasin = table.cellWidget(row, 10)
+    combo_from2 = table.cellWidget(row, 3)
+    combo_to2 = table.cellWidget(row, 5)
+    chk_mixingrate = table.cellWidget(row, 10)
+    spin_pct = table.cellWidget(row, 11)
+    chk_interbasin = table.cellWidget(row, 12)
 
+    combo_from2.setEnabled(False)
+    combo_to2.setEnabled(False)
     combo_alg.setEnabled(True)
     spin_pct.setEnabled(False)
     chk_interbasin.setChecked(False)
@@ -75,6 +84,8 @@ def setProcAlg(self,row):
     # index = self.dlg.table_hydroprocess.indexAt(currentWidget.pos())
     # widgetRow = index.row()
     combo_alg.clear()
+    combo_from2.clear()
+    combo_to2.clear()
     combo_alg.addItem('')
 
     # if isinstance(currentWidget, QComboBox):
@@ -142,11 +153,14 @@ def setProcAlg(self,row):
     elif selectedProc == 'Abstraction':
         combo_alg.addItems(abstractionAlg)
     elif selectedProc == 'Split':
+        combo_to2.setEnabled(True)
         combo_alg.addItems(splitAlg)
         chk_mixingrate.setEnabled(True)
     elif selectedProc == 'Convolve':
         combo_alg.addItems(convolutionAlg)
     elif selectedProc == 'LateralFlush':
+        combo_from2.setEnabled(True)
+        combo_to2.setEnabled(True)
         combo_alg.addItems(lateralflushAlg)
     elif selectedProc == 'LateralEquilibrate':
         combo_alg.addItems(lateralequilibrateAlg)
@@ -235,9 +249,13 @@ def setStorage(self,selectedProc, row):
     combo_proc = table.cellWidget(row, 0)
     combo_alg = table.cellWidget(row, 1)
     combo_from = table.cellWidget(row, 2)
-    combo_to = table.cellWidget(row, 3)
+    combo_from2 = table.cellWidget(row,3)
+    combo_to = table.cellWidget(row, 4)
+    combo_to2 = table.cellWidget(row,5)
     combo_from.clear()
     combo_to.clear()
+    combo_from2.clear()
+    combo_to2.clear()
     
     
     
@@ -393,9 +411,24 @@ def setStorage(self,selectedProc, row):
         #toredirectflow = self.dlg.table_hydroprocess.cellWidget(widgetRow-1,3).currentText()
         combo_from.addItems(tmpanyCompartment)
         combo_to.addItems(tmpanyCompartment) 
-    elif selectedProc == 'Flush' or selectedProc == "Overflow" or selectedProc == 'Split' or selectedProc == 'LateralFlush' or selectedProc == 'LateralEquilibrate':
+    elif selectedProc == 'LateralFlush':
+            hrugroups = [x.strip() for x in self.dlg.txt_defhru.toPlainText().split(',')]
+            combo_from2.addItem('')
+            combo_to2.addItem('')
+            combo_from2.addItems(statevariables)
+            combo_to2.addItems(statevariables)
+            if hrugroups[0] !='':
+                combo_from.addItems(hrugroups)
+                combo_to.addItems(hrugroups)
+            else:
+                combo_from.addItem('HRUs undefined')
+                combo_to.addItem('HRUs undefined')
+            
+    elif selectedProc == 'Flush' or selectedProc == "Overflow" or selectedProc == 'Split' or selectedProc == 'LateralEquilibrate':
         if selectedProc == 'LateralEquilibrate':
             tmpanyCompartment.append('AllHRUs')
+        elif selectedProc == 'Split':
+            combo_to2.addItems(tmpanyCompartment)
         combo_from.addItems(tmpanyCompartment)
         combo_to.addItems(tmpanyCompartment)
     # table.setCellWidget(row, 2, combo_from) #Set the combobox for the from compartment
@@ -410,10 +443,10 @@ def enableConditionalProc(self,row):
     
     table = self.dlg.table_hydroprocess
   
-    chk_isConditional = table.cellWidget(row, 4)
-    combo_basedtype = table.cellWidget(row, 5)
-    combo_comparison = table.cellWidget(row, 6)
-    txt_hrutype = table.cellWidget(row, 7)
+    chk_isConditional = table.cellWidget(row, 6)
+    combo_basedtype = table.cellWidget(row, 7)
+    combo_comparison = table.cellWidget(row, 8)
+    txt_hrutype = table.cellWidget(row, 9)
 
     combo_basedtype.clear()
     combo_comparison.clear()
@@ -435,8 +468,8 @@ def enableMixingRate(self, row):
     # currentWidget = self.dlg.sender()
     # index = self.dlg.table_hydroprocess.indexAt(currentWidget.pos())
     # widgetRow = index.row()
-    chk_mixingrate = table.cellWidget(row, 8)
-    spin_pct = table.cellWidget(row, 9)
+    chk_mixingrate = table.cellWidget(row, 10)
+    spin_pct = table.cellWidget(row, 11)
     
     spin_pct.setSingleStep(0.1)
     spin_pct.setMaximum(1.0)
@@ -460,14 +493,18 @@ def getHydroProcess(self):
         for col in range(cols):
             currentWidget = table.cellWidget(row,col)
             if isinstance(currentWidget, QComboBox):
-                processesList.append(currentWidget.currentText())
+                if col == 3:
+                    if currentWidget.currentText() != '':   #It is lateralflush and requires "To" keyword 
+                        processesList.append(currentWidget.currentText()+' To ')
+                else:             
+                    processesList.append(currentWidget.currentText())
             elif isinstance(currentWidget, QCheckBox):
                 if currentWidget.isChecked():
-                    if col == 4:
+                    if col == 6:
                         processesList.append('condTrue')    #The checkbox is Conditional
-                    elif col == 8:
-                        processesList.append('mixTrue') #The checkbox is Mixing rate
                     elif col == 10:
+                        processesList.append('mixTrue') #The checkbox is Mixing rate
+                    elif col == 12:
                         #processesList.append('interbasinTrue')  #The checkbox is Interbasin
                         processesList.insert(-5,'interbasinTrue')
                 else:
@@ -475,7 +512,7 @@ def getHydroProcess(self):
             elif isinstance(currentWidget, QLineEdit):
                 processesList.append(currentWidget.text().upper())
             elif isinstance(currentWidget, QDoubleSpinBox):
-                if table.cellWidget(row,8).isChecked() or table.cellWidget(row,0).currentText() == 'LateralEquilibrate':
+                if table.cellWidget(row,10).isChecked() or table.cellWidget(row,0).currentText() == 'LateralEquilibrate':
                     #processesList.append("{:.1f}".format(currentWidget.value()))
                     processesList.insert(-5,"{:.1f}".format(currentWidget.value()))
                 else:
@@ -649,6 +686,10 @@ def getHydroProcess(self):
 fromConvolution = []
 fromCropheatunit = ['CROP_HEAT_UNIT','']
 toCropheatunit = ['CROP_HEAT_UNIT','']
+statevariables = ['SURFACE_WATER','ATMOSPHERE','ATMOS_PRECIP','PONDED_WATER','SOIL','GROUNDWATER',
+                  'CANOPY','CANOPY_SNOW','TRUNK','ROOT','DEPRESSION','WETLAND','LAKE_STORAGE','SNOW',
+                  'SNOW_LIQ','GLACIER','GLACIER_ICE']
+statevariables.sort()
 
 anyCompartment = list(set().union(
                                   fromPrecip,toPrecip,fromCanevp,toCanevp,fromSoilevap,toSoilevap,
diff --git a/qraven/modules/templates/awbm.py b/qraven/modules/templates/awbm.py
index 6dd9f77..110ee29 100644
--- a/qraven/modules/templates/awbm.py
+++ b/qraven/modules/templates/awbm.py
@@ -30,7 +30,7 @@ def loadAwbm(self):
         combo_alg.setCurrentText("PRECIP_RAVEN")
         combo_from = table.cellWidget(0,2)
         combo_from.setCurrentText("ATMOS_PRECIP")
-        combo_to = table.cellWidget(0,3)
+        combo_to = table.cellWidget(0,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(1,0)
@@ -39,7 +39,7 @@ def loadAwbm(self):
         combo_alg.setCurrentText("SNOBAL_SIMPLE_MELT")
         combo_from = table.cellWidget(1,2)
         combo_from.setCurrentText("SNOW")
-        combo_to = table.cellWidget(1,3)
+        combo_to = table.cellWidget(1,4)
         combo_to.setCurrentText("PONDED_WATER")
 
         combo_proc = table.cellWidget(2,0)
@@ -48,7 +48,7 @@ def loadAwbm(self):
         combo_alg.setCurrentText("INF_AWBM")
         combo_from = table.cellWidget(2,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(2,3)
+        combo_to = table.cellWidget(2,4)
         combo_to.setCurrentText("MULTIPLE")
         
         combo_proc = table.cellWidget(3,0)
@@ -57,7 +57,7 @@ def loadAwbm(self):
         combo_alg.setCurrentText("SOILEVAP_AWBM")
         combo_from = table.cellWidget(3,2)
         combo_from.setCurrentText("MULTIPLE")
-        combo_to = table.cellWidget(3,3)
+        combo_to = table.cellWidget(3,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(4,0)
@@ -66,7 +66,7 @@ def loadAwbm(self):
         combo_alg.setCurrentText("BASE_LINEAR")
         combo_from = table.cellWidget(4,2)
         combo_from.setCurrentText("SOIL[3]")
-        combo_to = table.cellWidget(4,3)
+        combo_to = table.cellWidget(4,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
 
diff --git a/qraven/modules/templates/canshield.py b/qraven/modules/templates/canshield.py
index c1042af..513c371 100644
--- a/qraven/modules/templates/canshield.py
+++ b/qraven/modules/templates/canshield.py
@@ -31,7 +31,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("FREEZE_DEGREE_DAY")
         combo_from = table.cellWidget(0,2)
         combo_from.setCurrentText("SNOW_LIQ")
-        combo_to = table.cellWidget(0,3)
+        combo_to = table.cellWidget(0,4)
         combo_to.setCurrentText("SNOW")
 
         combo_proc = table.cellWidget(1,0)
@@ -40,7 +40,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("PRECIP_RAVEN")
         combo_from = table.cellWidget(1,2)
         combo_from.setCurrentText("ATMOS_PRECIP")
-        combo_to = table.cellWidget(1,3)
+        combo_to = table.cellWidget(1,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(2,0)
@@ -49,7 +49,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("CANEVP_MAXIMUM")
         combo_from = table.cellWidget(2,2)
         combo_from.setCurrentText("CANOPY")
-        combo_to = table.cellWidget(2,3)
+        combo_to = table.cellWidget(2,4)
         combo_to.setCurrentText("ATMOSPHERE")
         
         combo_proc = table.cellWidget(3,0)
@@ -58,7 +58,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("SUBLIM_MAXIMUM")
         combo_from = table.cellWidget(3,2)
         combo_from.setCurrentText("CANOPY_SNOW")
-        combo_to = table.cellWidget(3,3)
+        combo_to = table.cellWidget(3,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(4,0)
@@ -67,7 +67,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("SNOBAL_TWO_LAYER")
         combo_from = table.cellWidget(4,2)
         combo_from.setCurrentText("MULTIPLE")
-        combo_to = table.cellWidget(4,3)
+        combo_to = table.cellWidget(4,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(5,0)
@@ -76,7 +76,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("ABST_FILL")
         combo_from = table.cellWidget(5,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(5,3)
+        combo_to = table.cellWidget(5,4)
         combo_to.setCurrentText("DEPRESSION")
 
         combo_proc = table.cellWidget(6,0)
@@ -85,7 +85,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("OPEN_WATER_EVAP")
         combo_from = table.cellWidget(6,2)
         combo_from.setCurrentText("DEPRESSION")
-        combo_to = table.cellWidget(6,3)
+        combo_to = table.cellWidget(6,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(7,0)
@@ -94,7 +94,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("INF_HBV")
         combo_from = table.cellWidget(7,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(7,3)
+        combo_to = table.cellWidget(7,4)
         combo_to.setCurrentText("MULTIPLE")
         
         combo_proc = table.cellWidget(8,0)
@@ -103,7 +103,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("LAKEREL_LINEAR")
         combo_from = table.cellWidget(8,2)
         combo_from.setCurrentText("LAKE_STORAGE")
-        combo_to = table.cellWidget(8,3)
+        combo_to = table.cellWidget(8,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(9,0)
@@ -112,7 +112,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("SOILEVAP_ROOT")
         combo_from = table.cellWidget(9,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(9,3)
+        combo_to = table.cellWidget(9,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(10,0)
@@ -121,7 +121,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("PERC_GAWSER_CONSTRAIN")
         combo_from = table.cellWidget(10,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(10,3)
+        combo_to = table.cellWidget(10,4)
         combo_to.setCurrentText("SOIL[1]")
 
         combo_proc = table.cellWidget(11,0)
@@ -130,7 +130,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("PERC_GAWSER_CONSTRAIN")
         combo_from = table.cellWidget(11,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(11,3)
+        combo_to = table.cellWidget(11,4)
         combo_to.setCurrentText("SOIL[2]")
 
         combo_proc = table.cellWidget(12,0)
@@ -139,7 +139,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("BASE_THRESH_POWER")
         combo_from = table.cellWidget(12,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(12,3)
+        combo_to = table.cellWidget(12,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(13,0)
@@ -148,7 +148,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("BASE_THRESH_POWER")
         combo_from = table.cellWidget(13,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(13,3)
+        combo_to = table.cellWidget(13,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(14,0)
@@ -157,7 +157,7 @@ def loadCanshield(self):
         combo_alg.setCurrentText("BASE_THRESH_POWER")
         combo_from = table.cellWidget(14,2)
         combo_from.setCurrentText("SOIL[2]")
-        combo_to = table.cellWidget(14,3)
+        combo_to = table.cellWidget(14,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         table.resizeColumnsToContents() #Resizes the width of the column automatically
diff --git a/qraven/modules/templates/gr4j.py b/qraven/modules/templates/gr4j.py
index c717305..25e31c1 100644
--- a/qraven/modules/templates/gr4j.py
+++ b/qraven/modules/templates/gr4j.py
@@ -30,7 +30,7 @@ def loadGr4j(self):
         combo_alg.setCurrentText("PRECIP_RAVEN")
         combo_from = table.cellWidget(0,2)
         combo_from.setCurrentText("ATMOS_PRECIP")
-        combo_to = table.cellWidget(0,3)
+        combo_to = table.cellWidget(0,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(1,0)
@@ -39,6 +39,8 @@ def loadGr4j(self):
         combo_alg.setCurrentText("SNOTEMP_NEWTONS")
         combo_from = table.cellWidget(1,2)
         combo_from.setCurrentText("SNOW_TEMP")
+        combo_from = table.cellWidget(1,4)
+        combo_from.setCurrentText("")
     
         combo_proc = table.cellWidget(2,0)
         combo_proc.setCurrentText("SnowBalance")
@@ -46,7 +48,7 @@ def loadGr4j(self):
         combo_alg.setCurrentText("SNOBAL_CEMA_NEIGE")
         combo_from = table.cellWidget(2,2)
         combo_from.setCurrentText("SNOW")
-        combo_to = table.cellWidget(2,3)
+        combo_to = table.cellWidget(2,4)
         combo_to.setCurrentText("PONDED_WATER")
         
         combo_proc = table.cellWidget(3,0)
@@ -55,7 +57,7 @@ def loadGr4j(self):
         combo_alg.setCurrentText("OPEN_WATER_EVAP")
         combo_from = table.cellWidget(3,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(3,3)
+        combo_to = table.cellWidget(3,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(4,0)
@@ -64,7 +66,7 @@ def loadGr4j(self):
         combo_alg.setCurrentText("INF_GR4J")
         combo_from = table.cellWidget(4,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(4,3)
+        combo_to = table.cellWidget(4,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(5,0)
@@ -73,7 +75,7 @@ def loadGr4j(self):
         combo_alg.setCurrentText("SOILEVAP_GR4J")
         combo_from = table.cellWidget(5,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(5,3)
+        combo_to = table.cellWidget(5,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(6,0)
@@ -82,7 +84,7 @@ def loadGr4j(self):
         combo_alg.setCurrentText("PERC_GR4J")
         combo_from = table.cellWidget(6,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(6,3)
+        combo_to = table.cellWidget(6,4)
         combo_to.setCurrentText("SOIL[2]")
 
         combo_proc = table.cellWidget(7,0)
@@ -91,18 +93,23 @@ def loadGr4j(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(7,2)
         combo_from.setCurrentText("SURFACE_WATER")
-        combo_to = table.cellWidget(7,3)
+        combo_to = table.cellWidget(7,4)
         combo_to.setCurrentText("SOIL[2]")
         
-        #NEED MODIFICATION IN GUI TO SUPPORT SPLIT COMMAND
         combo_proc = table.cellWidget(8,0)
         combo_proc.setCurrentText("Split")
         combo_alg = table.cellWidget(8,1)
         combo_alg.setCurrentText("RAVEN_DEFAULT")
-        # combo_from = table.cellWidget(8,2)
-        # combo_from.setCurrentText("PONDED_WATER")
-        # combo_to = table.cellWidget(8,3)
-        # combo_to.setCurrentText("MULTIPLE")
+        combo_from = table.cellWidget(8,2)
+        combo_from.setCurrentText("SOIL[2]")
+        combo_to = table.cellWidget(8,4)
+        combo_to.setCurrentText("CONVOLUTION[0]")
+        combo_to2 = table.cellWidget(8,5)
+        combo_to2.setCurrentText("CONVOLUTION[1]")
+        chk_mixingrate = table.cellWidget(8,10)
+        chk_mixingrate.setChecked(True)
+        spin_pct = table.cellWidget(8,11)
+        spin_pct.setValue(0.9)
 
         combo_proc = table.cellWidget(9,0)
         combo_proc.setCurrentText("Convolve")
@@ -110,7 +117,7 @@ def loadGr4j(self):
         combo_alg.setCurrentText("CONVOL_GR4J_1")
         combo_from = table.cellWidget(9,2)
         combo_from.setCurrentText("CONVOLUTION[0]")
-        combo_to = table.cellWidget(9,3)
+        combo_to = table.cellWidget(9,4)
         combo_to.setCurrentText("SOIL[1]")
 
         combo_proc = table.cellWidget(10,0)
@@ -119,7 +126,7 @@ def loadGr4j(self):
         combo_alg.setCurrentText("CONVOL_GR4J_2")
         combo_from = table.cellWidget(10,2)
         combo_from.setCurrentText("CONVOLUTION[1]")
-        combo_to = table.cellWidget(10,3)
+        combo_to = table.cellWidget(10,4)
         combo_to.setCurrentText("SOIL[2]")
 
         combo_proc = table.cellWidget(11,0)
@@ -128,7 +135,7 @@ def loadGr4j(self):
         combo_alg.setCurrentText("PERC_GR4JEXCH")
         combo_from = table.cellWidget(11,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(11,3)
+        combo_to = table.cellWidget(11,4)
         combo_to.setCurrentText("SOIL[3]")
 
         combo_proc = table.cellWidget(12,0)
@@ -137,7 +144,7 @@ def loadGr4j(self):
         combo_alg.setCurrentText("PERC_GR4JEXCH2")
         combo_from = table.cellWidget(12,2)
         combo_from.setCurrentText("SOIL[2]")
-        combo_to = table.cellWidget(12,3)
+        combo_to = table.cellWidget(12,4)
         combo_to.setCurrentText("SOIL[3]")
 
         combo_proc = table.cellWidget(13,0)
@@ -146,7 +153,7 @@ def loadGr4j(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(13,2)
         combo_from.setCurrentText("SOIL[2]")
-        combo_to = table.cellWidget(13,3)
+        combo_to = table.cellWidget(13,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(14,0)
@@ -155,7 +162,7 @@ def loadGr4j(self):
         combo_alg.setCurrentText("BASE_GR4J")
         combo_from = table.cellWidget(14,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(14,3)
+        combo_to = table.cellWidget(14,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         table.resizeColumnsToContents() #Resizes the width of the column automatically
diff --git a/qraven/modules/templates/hbvec.py b/qraven/modules/templates/hbvec.py
index 168a658..c933858 100644
--- a/qraven/modules/templates/hbvec.py
+++ b/qraven/modules/templates/hbvec.py
@@ -39,7 +39,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("FREEZE_DEGREE_DAY")
         combo_from = table.cellWidget(0,2)
         combo_from.setCurrentText("SNOW_LIQ")
-        combo_to = table.cellWidget(0,3)
+        combo_to = table.cellWidget(0,4)
         combo_to.setCurrentText("SNOW")
     
         combo_proc = table.cellWidget(1,0)
@@ -48,7 +48,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("PRECIP_RAVEN")
         combo_from = table.cellWidget(1,2)
         combo_from.setCurrentText("ATMOS_PRECIP")
-        combo_to = table.cellWidget(1,3)
+        combo_to = table.cellWidget(1,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(2,0)
@@ -57,7 +57,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("CANEVP_ALL")
         combo_from = table.cellWidget(2,2)
         combo_from.setCurrentText("CANOPY")
-        combo_to = table.cellWidget(2,3)
+        combo_to = table.cellWidget(2,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(3,0)
@@ -66,7 +66,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("SUBLIM_ALL")
         combo_from = table.cellWidget(3,2)
         combo_from.setCurrentText("CANOPY_SNOW")
-        combo_to = table.cellWidget(3,3)
+        combo_to = table.cellWidget(3,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(4,0)
@@ -75,7 +75,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("SNOBAL_SIMPLE_MELT")
         combo_from = table.cellWidget(4,2)
         combo_from.setCurrentText("SNOW")
-        combo_to = table.cellWidget(4,3)
+        combo_to = table.cellWidget(4,4)
         combo_to.setCurrentText("SNOW_LIQ")
 
         combo_proc = table.cellWidget(5,0)
@@ -84,7 +84,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(5,2)
         combo_from.setCurrentText("SNOW_LIQ")
-        combo_to = table.cellWidget(5,3)
+        combo_to = table.cellWidget(5,4)
         combo_to.setCurrentText("PONDED_WATER")
 
         combo_proc = table.cellWidget(6,0)
@@ -93,15 +93,15 @@ def loadHbvec(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(6,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(6,3)
+        combo_to = table.cellWidget(6,4)
         combo_to.setCurrentText("GLACIER")
-        checkconditional = table.cellWidget(6,4)
+        checkconditional = table.cellWidget(6,6)
         checkconditional.setChecked(True)
-        combo_basedtype = table.cellWidget(6,5)
+        combo_basedtype = table.cellWidget(6,7)
         combo_basedtype.setCurrentText("HRU_TYPE")
-        combo_comparison = table.cellWidget(6,6)
+        combo_comparison = table.cellWidget(6,8)
         combo_comparison.setCurrentText("IS")
-        txt_hrutype = table.cellWidget(6,7)
+        txt_hrutype = table.cellWidget(6,9)
         txt_hrutype.setText("GLACIER")
 
         combo_proc = table.cellWidget(7,0)
@@ -110,7 +110,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("GMELT_HBV")
         combo_from = table.cellWidget(7,2)
         combo_from.setCurrentText("GLACIER_ICE")
-        combo_to = table.cellWidget(7,3)
+        combo_to = table.cellWidget(7,4)
         combo_to.setCurrentText("GLACIER")
 
         combo_proc = table.cellWidget(8,0)
@@ -119,7 +119,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("GRELEASE_HBV_EC")
         combo_from = table.cellWidget(8,2)
         combo_from.setCurrentText("GLACIER")
-        combo_to = table.cellWidget(8,3)
+        combo_to = table.cellWidget(8,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(9,0)
@@ -128,7 +128,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("INF_HBV")
         combo_from = table.cellWidget(9,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(9,3)
+        combo_to = table.cellWidget(9,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(10,0)
@@ -137,15 +137,15 @@ def loadHbvec(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(10,2)
         combo_from.setCurrentText("SURFACE_WATER")
-        combo_to = table.cellWidget(10,3)
+        combo_to = table.cellWidget(10,4)
         combo_to.setCurrentText("SOIL[1]")
-        checkconditional = table.cellWidget(10,4)
+        checkconditional = table.cellWidget(10,6)
         checkconditional.setChecked(True)
-        combo_basedtype = table.cellWidget(10,5)
+        combo_basedtype = table.cellWidget(10,7)
         combo_basedtype.setCurrentText("HRU_TYPE")
-        combo_comparison = table.cellWidget(10,6)
+        combo_comparison = table.cellWidget(10,8)
         combo_comparison.setCurrentText("IS_NOT")
-        txt_hrutype = table.cellWidget(10,7)
+        txt_hrutype = table.cellWidget(10,9)
         txt_hrutype.setText("GLACIER")
 
         combo_proc = table.cellWidget(11,0)
@@ -154,15 +154,15 @@ def loadHbvec(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(11,2)
         combo_from.setCurrentText("SOIL[2]")
-        combo_to = table.cellWidget(11,3)
+        combo_to = table.cellWidget(11,4)
         combo_to.setCurrentText("SURFACE_WATER")
-        checkconditional = table.cellWidget(11,4)
+        checkconditional = table.cellWidget(11,6)
         checkconditional.setChecked(True)
-        combo_basedtype = table.cellWidget(11,5)
+        combo_basedtype = table.cellWidget(11,7)
         combo_basedtype.setCurrentText("HRU_TYPE")
-        combo_comparison = table.cellWidget(11,6)
+        combo_comparison = table.cellWidget(11,8)
         combo_comparison.setCurrentText("IS")
-        txt_hrutype = table.cellWidget(11,7)
+        txt_hrutype = table.cellWidget(11,9)
         txt_hrutype.setText("LAKE")
 
         combo_proc = table.cellWidget(12,0)
@@ -171,7 +171,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("SOILEVAP_HBV")
         combo_from = table.cellWidget(12,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(12,3)
+        combo_to = table.cellWidget(12,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(13,0)
@@ -180,7 +180,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("CRISE_HBV")
         combo_from = table.cellWidget(13,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(13,3)
+        combo_to = table.cellWidget(13,4)
         combo_to.setCurrentText("SOIL[0]")
 
         combo_proc = table.cellWidget(14,0)
@@ -189,7 +189,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("LAKE_EVAP_BASIC")
         combo_from = table.cellWidget(14,2)
         combo_from.setCurrentText("SOIL[2]")
-        combo_to = table.cellWidget(14,3)
+        combo_to = table.cellWidget(14,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(15,0)
@@ -198,7 +198,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("SOILEVAP_HBV")
         combo_from = table.cellWidget(15,2)
         combo_from.setCurrentText("SOIL[2]")
-        combo_to = table.cellWidget(15,3)
+        combo_to = table.cellWidget(15,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(16,0)
@@ -207,7 +207,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("PERC_CONSTANT")
         combo_from = table.cellWidget(16,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(16,3)
+        combo_to = table.cellWidget(16,4)
         combo_to.setCurrentText("SOIL[2]")
 
         combo_proc = table.cellWidget(17,0)
@@ -216,7 +216,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("BASE_POWER_LAW")
         combo_from = table.cellWidget(17,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(17,3)
+        combo_to = table.cellWidget(17,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(18,0)
@@ -225,7 +225,7 @@ def loadHbvec(self):
         combo_alg.setCurrentText("BASE_LINEAR")
         combo_from = table.cellWidget(18,2)
         combo_from.setCurrentText("SOIL[2]")
-        combo_to = table.cellWidget(18,3)
+        combo_to = table.cellWidget(18,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(19,0)
@@ -234,9 +234,9 @@ def loadHbvec(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(19,2)
         combo_from.setCurrentText("AllHRUs")
-        combo_to = table.cellWidget(19,3)
+        combo_to = table.cellWidget(19,4)
         combo_to.setCurrentText("SOIL[1]")
-        spin_pct = table.cellWidget(19,9)
+        spin_pct = table.cellWidget(19,11)
         spin_pct.setValue(1.0)
 
         combo_proc = table.cellWidget(20,0)
@@ -245,9 +245,9 @@ def loadHbvec(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(20,2)
         combo_from.setCurrentText("AllHRUs")
-        combo_to = table.cellWidget(20,3)
+        combo_to = table.cellWidget(20,4)
         combo_to.setCurrentText("SOIL[2]")
-        spin_pct = table.cellWidget(20,9)
+        spin_pct = table.cellWidget(20,11)
         spin_pct.setValue(1.0)
 
         table.resizeColumnsToContents() #Resizes the width of the column automatically
diff --git a/qraven/modules/templates/hbvlight.py b/qraven/modules/templates/hbvlight.py
index c28d7f1..c2eda17 100644
--- a/qraven/modules/templates/hbvlight.py
+++ b/qraven/modules/templates/hbvlight.py
@@ -31,7 +31,7 @@ def loadHbvlight(self):
         combo_alg.setCurrentText("FREEZE_DEGREE_DAY")
         combo_from = table.cellWidget(0,2)
         combo_from.setCurrentText("SNOW_LIQ")
-        combo_to = table.cellWidget(0,3)
+        combo_to = table.cellWidget(0,4)
         combo_to.setCurrentText("SNOW")
     
         combo_proc = table.cellWidget(1,0)
@@ -40,7 +40,7 @@ def loadHbvlight(self):
         combo_alg.setCurrentText("PRECIP_RAVEN")
         combo_from = table.cellWidget(1,2)
         combo_from.setCurrentText("ATMOS_PRECIP")
-        combo_to = table.cellWidget(1,3)
+        combo_to = table.cellWidget(1,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(2,0)
@@ -49,7 +49,7 @@ def loadHbvlight(self):
         combo_alg.setCurrentText("SNOBAL_SIMPLE_MELT")
         combo_from = table.cellWidget(2,2)
         combo_from.setCurrentText("SNOW")
-        combo_to = table.cellWidget(2,3)
+        combo_to = table.cellWidget(2,4)
         combo_to.setCurrentText("SNOW_LIQ")
 
         combo_proc = table.cellWidget(3,0)
@@ -58,7 +58,7 @@ def loadHbvlight(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(3,2)
         combo_from.setCurrentText("SNOW_LIQ")
-        combo_to = table.cellWidget(3,3)
+        combo_to = table.cellWidget(3,4)
         combo_to.setCurrentText("PONDED_WATER")
 
         combo_proc = table.cellWidget(4,0)
@@ -67,7 +67,7 @@ def loadHbvlight(self):
         combo_alg.setCurrentText("INF_HBV")
         combo_from = table.cellWidget(4,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(4,3)
+        combo_to = table.cellWidget(4,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(5,0)
@@ -76,7 +76,7 @@ def loadHbvlight(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(5,2)
         combo_from.setCurrentText("SURFACE_WATER")
-        combo_to = table.cellWidget(5,3)
+        combo_to = table.cellWidget(5,4)
         combo_to.setCurrentText("SOIL[1]")
 
         combo_proc = table.cellWidget(6,0)
@@ -85,7 +85,7 @@ def loadHbvlight(self):
         combo_alg.setCurrentText("SOILEVAP_HBV")
         combo_from = table.cellWidget(6,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(6,3)
+        combo_to = table.cellWidget(6,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(7,0)
@@ -94,7 +94,7 @@ def loadHbvlight(self):
         combo_alg.setCurrentText("CRISE_HBV")
         combo_from = table.cellWidget(7,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(7,3)
+        combo_to = table.cellWidget(7,4)
         combo_to.setCurrentText("SOIL[0]")
 
         combo_proc = table.cellWidget(8,0)
@@ -103,7 +103,7 @@ def loadHbvlight(self):
         combo_alg.setCurrentText("PERC_CONSTANT")
         combo_from = table.cellWidget(8,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(8,3)
+        combo_to = table.cellWidget(8,4)
         combo_to.setCurrentText("SOIL[2]")
 
         combo_proc = table.cellWidget(9,0)
@@ -112,7 +112,7 @@ def loadHbvlight(self):
         combo_alg.setCurrentText("BASE_POWER_LAW")
         combo_from = table.cellWidget(9,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(9,3)
+        combo_to = table.cellWidget(9,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(10,0)
@@ -121,7 +121,7 @@ def loadHbvlight(self):
         combo_alg.setCurrentText("BASE_THRESH_POWER")
         combo_from = table.cellWidget(10,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(10,3)
+        combo_to = table.cellWidget(10,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(11,0)
@@ -130,7 +130,7 @@ def loadHbvlight(self):
         combo_alg.setCurrentText("BASE_LINEAR")
         combo_from = table.cellWidget(11,2)
         combo_from.setCurrentText("SOIL[2]")
-        combo_to = table.cellWidget(11,3)
+        combo_to = table.cellWidget(11,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         table.resizeColumnsToContents() #Resizes the width of the column automatically
diff --git a/qraven/modules/templates/hmets.py b/qraven/modules/templates/hmets.py
index adf7d14..60ee6ed 100644
--- a/qraven/modules/templates/hmets.py
+++ b/qraven/modules/templates/hmets.py
@@ -23,7 +23,7 @@ def loadHmets(self):
         combo_alg.setCurrentText("SNOBAL_HMETS")
         combo_from = table.cellWidget(0,2)
         combo_from.setCurrentText("MULTIPLE")
-        combo_to = table.cellWidget(0,3)
+        combo_to = table.cellWidget(0,4)
         combo_to.setCurrentText("MULTIPLE")
     
         combo_proc = table.cellWidget(1,0)
@@ -32,7 +32,7 @@ def loadHmets(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(1,2)
         combo_from.setCurrentText("ATMOS_PRECIP")
-        combo_to = table.cellWidget(1,3)
+        combo_to = table.cellWidget(1,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(2,0)
@@ -41,7 +41,7 @@ def loadHmets(self):
         combo_alg.setCurrentText("INF_HMETS")
         combo_from = table.cellWidget(2,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(2,3)
+        combo_to = table.cellWidget(2,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(3,0)
@@ -50,7 +50,7 @@ def loadHmets(self):
         combo_alg.setCurrentText("OVERFLOW_RAVEN")
         combo_from = table.cellWidget(3,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(3,3)
+        combo_to = table.cellWidget(3,4)
         combo_to.setCurrentText("CONVOLUTION[1]")
 
         combo_proc = table.cellWidget(4,0)
@@ -59,7 +59,7 @@ def loadHmets(self):
         combo_alg.setCurrentText("BASE_LINEAR")
         combo_from = table.cellWidget(4,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(4,3)
+        combo_to = table.cellWidget(4,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(5,0)
@@ -68,7 +68,7 @@ def loadHmets(self):
         combo_alg.setCurrentText("PERC_LINEAR")
         combo_from = table.cellWidget(5,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(5,3)
+        combo_to = table.cellWidget(5,4)
         combo_to.setCurrentText("SOIL[1]")
 
         combo_proc = table.cellWidget(6,0)
@@ -77,7 +77,7 @@ def loadHmets(self):
         combo_alg.setCurrentText("OVERFLOW_RAVEN")
         combo_from = table.cellWidget(6,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(6,3)
+        combo_to = table.cellWidget(6,4)
         combo_to.setCurrentText("CONVOLUTION[1]")
 
         combo_proc = table.cellWidget(7,0)
@@ -86,7 +86,7 @@ def loadHmets(self):
         combo_alg.setCurrentText("SOILEVAP_ALL")
         combo_from = table.cellWidget(7,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(7,3)
+        combo_to = table.cellWidget(7,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(8,0)
@@ -95,7 +95,7 @@ def loadHmets(self):
         combo_alg.setCurrentText("CONVOL_GAMMA")
         combo_from = table.cellWidget(8,2)
         combo_from.setCurrentText("CONVOLUTION[0]")
-        combo_to = table.cellWidget(8,3)
+        combo_to = table.cellWidget(8,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(9,0)
@@ -104,7 +104,7 @@ def loadHmets(self):
         combo_alg.setCurrentText("CONVOL_GAMMA2")
         combo_from = table.cellWidget(9,2)
         combo_from.setCurrentText("CONVOLUTION[1]")
-        combo_to = table.cellWidget(9,3)
+        combo_to = table.cellWidget(9,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(10,0)
@@ -113,7 +113,7 @@ def loadHmets(self):
         combo_alg.setCurrentText("BASE_LINEAR")
         combo_from = table.cellWidget(10,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(10,3)
+        combo_to = table.cellWidget(10,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         table.resizeColumnsToContents() #Resizes the width of the column automatically
diff --git a/qraven/modules/templates/hymod.py b/qraven/modules/templates/hymod.py
index 0d950fb..a9b3e2b 100644
--- a/qraven/modules/templates/hymod.py
+++ b/qraven/modules/templates/hymod.py
@@ -29,7 +29,7 @@ def loadHymod(self):
         combo_alg.setCurrentText("PRECIP_RAVEN")
         combo_from = table.cellWidget(0,2)
         combo_from.setCurrentText("ATMOS_PRECIP")
-        combo_to = table.cellWidget(0,3)
+        combo_to = table.cellWidget(0,4)
         combo_to.setCurrentText("MULTIPLE")
     
         combo_proc = table.cellWidget(1,0)
@@ -38,7 +38,7 @@ def loadHymod(self):
         combo_alg.setCurrentText("SNOBAL_SIMPLE_MELT")
         combo_from = table.cellWidget(1,2)
         combo_from.setCurrentText("SNOW")
-        combo_to = table.cellWidget(1,3)
+        combo_to = table.cellWidget(1,4)
         combo_to.setCurrentText("PONDED_WATER")
 
         combo_proc = table.cellWidget(2,0)
@@ -47,7 +47,7 @@ def loadHymod(self):
         combo_alg.setCurrentText("INF_PDM")
         combo_from = table.cellWidget(2,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(2,3)
+        combo_to = table.cellWidget(2,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(3,0)
@@ -56,11 +56,11 @@ def loadHymod(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(3,2)
         combo_from.setCurrentText("SURFACE_WATER")
-        combo_to = table.cellWidget(3,3)
+        combo_to = table.cellWidget(3,4)
         combo_to.setCurrentText("SOIL[1]")
-        chk_mixingrate = table.cellWidget(3,8)
+        chk_mixingrate = table.cellWidget(3,10)
         chk_mixingrate.setChecked(True)
-        spin_pct = table.cellWidget(3,9)
+        spin_pct = table.cellWidget(3,11)
         spin_pct.setValue(0.5)
 
         combo_proc = table.cellWidget(4,0)
@@ -69,7 +69,7 @@ def loadHymod(self):
         combo_alg.setCurrentText("SOILEVAP_PDM")
         combo_from = table.cellWidget(4,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(4,3)
+        combo_to = table.cellWidget(4,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(5,0)
@@ -78,7 +78,7 @@ def loadHymod(self):
         combo_alg.setCurrentText("BASE_LINEAR")
         combo_from = table.cellWidget(5,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(5,3)
+        combo_to = table.cellWidget(5,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         table.resizeColumnsToContents() #Resizes the width of the column automatically
diff --git a/qraven/modules/templates/hypr.py b/qraven/modules/templates/hypr.py
index c3135e1..d4a6bc0 100644
--- a/qraven/modules/templates/hypr.py
+++ b/qraven/modules/templates/hypr.py
@@ -30,7 +30,7 @@ def loadHypr(self):
         combo_alg.setCurrentText("FREEZE_DEGREE_DAY")
         combo_from = table.cellWidget(0,2)
         combo_from.setCurrentText("SNOW_LIQ")
-        combo_to = table.cellWidget(0,3)
+        combo_to = table.cellWidget(0,4)
         combo_to.setCurrentText("SNOW")
 
         combo_proc = table.cellWidget(1,0)
@@ -39,7 +39,7 @@ def loadHypr(self):
         combo_alg.setCurrentText("PRECIP_RAVEN")
         combo_from = table.cellWidget(1,2)
         combo_from.setCurrentText("ATMOS_PRECIP")
-        combo_to = table.cellWidget(1,3)
+        combo_to = table.cellWidget(1,4)
         combo_to.setCurrentText("MULTIPLE")
     
         combo_proc = table.cellWidget(2,0)
@@ -48,7 +48,7 @@ def loadHypr(self):
         combo_alg.setCurrentText("CANEVP_ALL")
         combo_from = table.cellWidget(2,2)
         combo_from.setCurrentText("CANOPY")
-        combo_to = table.cellWidget(2,3)
+        combo_to = table.cellWidget(2,4)
         combo_to.setCurrentText("ATMOSPHERE")
         
         combo_proc = table.cellWidget(3,0)
@@ -57,7 +57,7 @@ def loadHypr(self):
         combo_alg.setCurrentText("SUBLIM_ALL")
         combo_from = table.cellWidget(3,2)
         combo_from.setCurrentText("CANOPY_SNOW")
-        combo_to = table.cellWidget(3,3)
+        combo_to = table.cellWidget(3,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(4,0)
@@ -66,7 +66,7 @@ def loadHypr(self):
         combo_alg.setCurrentText("SNOBAL_SIMPLE_MELT")
         combo_from = table.cellWidget(4,2)
         combo_from.setCurrentText("SNOW")
-        combo_to = table.cellWidget(4,3)
+        combo_to = table.cellWidget(4,4)
         combo_to.setCurrentText("PONDED_WATER")
 
         combo_proc = table.cellWidget(5,0)
@@ -75,7 +75,7 @@ def loadHypr(self):
         combo_alg.setCurrentText("INF_HBV")
         combo_from = table.cellWidget(5,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(5,3)
+        combo_to = table.cellWidget(5,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(6,0)
@@ -84,7 +84,7 @@ def loadHypr(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(6,2)
         combo_from.setCurrentText("SURFACE_WATER")
-        combo_to = table.cellWidget(6,3)
+        combo_to = table.cellWidget(6,4)
         combo_to.setCurrentText("PONDED_WATER")
 
         combo_proc = table.cellWidget(7,0)
@@ -93,7 +93,7 @@ def loadHypr(self):
         combo_alg.setCurrentText("ABST_PDMROF")
         combo_from = table.cellWidget(7,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(7,3)
+        combo_to = table.cellWidget(7,4)
         combo_to.setCurrentText("DEPRESSION")
         
         combo_proc = table.cellWidget(8,0)
@@ -102,7 +102,7 @@ def loadHypr(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(8,2)
         combo_from.setCurrentText("SURFACE_WATER")
-        combo_to = table.cellWidget(8,3)
+        combo_to = table.cellWidget(8,4)
         combo_to.setCurrentText("SOIL[1]")
 
         combo_proc = table.cellWidget(9,0)
@@ -111,7 +111,7 @@ def loadHypr(self):
         combo_alg.setCurrentText("SOILEVAP_HYPR")
         combo_from = table.cellWidget(9,2)
         combo_from.setCurrentText("MULTIPLE")
-        combo_to = table.cellWidget(9,3)
+        combo_to = table.cellWidget(9,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(10,0)
@@ -120,7 +120,7 @@ def loadHypr(self):
         combo_alg.setCurrentText("BASE_LINEAR")
         combo_from = table.cellWidget(10,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(10,3)
+        combo_to = table.cellWidget(10,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(11,0)
@@ -129,7 +129,7 @@ def loadHypr(self):
         combo_alg.setCurrentText("BASE_THRESH_STOR")
         combo_from = table.cellWidget(11,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(11,3)
+        combo_to = table.cellWidget(11,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         table.resizeColumnsToContents() #Resizes the width of the column automatically
diff --git a/qraven/modules/templates/mohyse.py b/qraven/modules/templates/mohyse.py
index 8153a53..93d7ea1 100644
--- a/qraven/modules/templates/mohyse.py
+++ b/qraven/modules/templates/mohyse.py
@@ -27,7 +27,7 @@ def loadMohyse(self):
         combo_alg.setCurrentText("SOILEVAP_LINEAR")
         combo_from = table.cellWidget(0,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(0,3)
+        combo_to = table.cellWidget(0,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(1,0)
@@ -36,7 +36,7 @@ def loadMohyse(self):
         combo_alg.setCurrentText("SNOBAL_SIMPLE_MELT")
         combo_from = table.cellWidget(1,2)
         combo_from.setCurrentText("SNOW")
-        combo_to = table.cellWidget(1,3)
+        combo_to = table.cellWidget(1,4)
         combo_to.setCurrentText("PONDED_WATER")
 
         combo_proc = table.cellWidget(2,0)
@@ -45,7 +45,7 @@ def loadMohyse(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(2,2)
         combo_from.setCurrentText("ATMOS_PRECIP")
-        combo_to = table.cellWidget(2,3)
+        combo_to = table.cellWidget(2,4)
         combo_to.setCurrentText("MULTIPLE")
         
         combo_proc = table.cellWidget(3,0)
@@ -54,7 +54,7 @@ def loadMohyse(self):
         combo_alg.setCurrentText("INF_HBV")
         combo_from = table.cellWidget(3,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(3,3)
+        combo_to = table.cellWidget(3,4)
         combo_to.setCurrentText("SOIL[0]")
 
         combo_proc = table.cellWidget(4,0)
@@ -63,7 +63,7 @@ def loadMohyse(self):
         combo_alg.setCurrentText("BASE_LINEAR")
         combo_from = table.cellWidget(4,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(4,3)
+        combo_to = table.cellWidget(4,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(5,0)
@@ -72,7 +72,7 @@ def loadMohyse(self):
         combo_alg.setCurrentText("PERC_LINEAR")
         combo_from = table.cellWidget(5,2)
         combo_from.setCurrentText("SOIL[0]")
-        combo_to = table.cellWidget(5,3)
+        combo_to = table.cellWidget(5,4)
         combo_to.setCurrentText("SOIL[1]")
 
         combo_proc = table.cellWidget(6,0)
@@ -81,7 +81,7 @@ def loadMohyse(self):
         combo_alg.setCurrentText("BASE_LINEAR")
         combo_from = table.cellWidget(6,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(6,3)
+        combo_to = table.cellWidget(6,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         table.resizeColumnsToContents() #Resizes the width of the column automatically
diff --git a/qraven/modules/templates/ubcwm.py b/qraven/modules/templates/ubcwm.py
index c9ef947..10f9c68 100644
--- a/qraven/modules/templates/ubcwm.py
+++ b/qraven/modules/templates/ubcwm.py
@@ -39,7 +39,7 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("SNOALB_UBCWM")
         combo_from = table.cellWidget(0,2)
         combo_from.setCurrentText('')
-        combo_to = table.cellWidget(0,3)
+        combo_to = table.cellWidget(0,4)
         combo_to.setCurrentText('')
 
         combo_proc = table.cellWidget(1,0)
@@ -48,7 +48,7 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("SNOBAL_UBCWM")
         combo_from = table.cellWidget(1,2)
         combo_from.setCurrentText("MULTIPLE")
-        combo_to = table.cellWidget(1,3)
+        combo_to = table.cellWidget(1,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(2,0)
@@ -57,15 +57,15 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(2,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(2,3)
+        combo_to = table.cellWidget(2,4)
         combo_to.setCurrentText("SOIL[4]")
-        checkconditional = table.cellWidget(2,4)
+        checkconditional = table.cellWidget(2,6)
         checkconditional.setChecked(True)
-        combo_basedtype = table.cellWidget(2,5)
+        combo_basedtype = table.cellWidget(2,7)
         combo_basedtype.setCurrentText("HRU_TYPE")
-        combo_comparison = table.cellWidget(2,6)
+        combo_comparison = table.cellWidget(2,8)
         combo_comparison.setCurrentText("IS")
-        txt_hrutype = table.cellWidget(2,7)
+        txt_hrutype = table.cellWidget(2,9)
         txt_hrutype.setText("GLACIER")
 
         combo_proc = table.cellWidget(3,0)
@@ -74,7 +74,7 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("GMELT_UBC")
         combo_from = table.cellWidget(3,2)
         combo_from.setCurrentText("GLACIER_ICE")
-        combo_to = table.cellWidget(3,3)
+        combo_to = table.cellWidget(3,4)
         combo_to.setCurrentText("PONDED_WATER")
 
         combo_proc = table.cellWidget(4,0)
@@ -83,7 +83,7 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("PRECIP_RAVEN")
         combo_from = table.cellWidget(4,2)
         combo_from.setCurrentText("ATMOS_PRECIP")
-        combo_to = table.cellWidget(4,3)
+        combo_to = table.cellWidget(4,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(5,0)
@@ -92,7 +92,7 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("SOILEVAP_UBC")
         combo_from = table.cellWidget(5,2)
         combo_from.setCurrentText("MULTIPLE")
-        combo_to = table.cellWidget(5,3)
+        combo_to = table.cellWidget(5,4)
         combo_to.setCurrentText("ATMOSPHERE")
 
         combo_proc = table.cellWidget(6,0)
@@ -101,7 +101,7 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("INF_UBC")
         combo_from = table.cellWidget(6,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(6,3)
+        combo_to = table.cellWidget(6,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(7,0)
@@ -110,15 +110,15 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("RAVEN_DEFAULT")
         combo_from = table.cellWidget(7,2)
         combo_from.setCurrentText("SURFACE_WATER")
-        combo_to = table.cellWidget(7,3)
+        combo_to = table.cellWidget(7,4)
         combo_to.setCurrentText("SOIL[4]")
-        checkconditional = table.cellWidget(7,4)
+        checkconditional = table.cellWidget(7,6)
         checkconditional.setChecked(True)
-        combo_basedtype = table.cellWidget(7,5)
+        combo_basedtype = table.cellWidget(7,7)
         combo_basedtype.setCurrentText("HRU_TYPE")
-        combo_comparison = table.cellWidget(7,6)
+        combo_comparison = table.cellWidget(7,8)
         combo_comparison.setCurrentText("IS_NOT")
-        txt_hrutype = table.cellWidget(7,7)
+        txt_hrutype = table.cellWidget(7,9)
         txt_hrutype.setText("LAKE")
 
         combo_proc = table.cellWidget(8,0)
@@ -127,7 +127,7 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("GINFIL_UBCWM")
         combo_from = table.cellWidget(8,2)
         combo_from.setCurrentText("PONDED_WATER")
-        combo_to = table.cellWidget(8,3)
+        combo_to = table.cellWidget(8,4)
         combo_to.setCurrentText("MULTIPLE")
 
         combo_proc = table.cellWidget(9,0)
@@ -136,7 +136,7 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("PERC_LINEAR_ANALYTIC")
         combo_from = table.cellWidget(9,2)
         combo_from.setCurrentText("SOIL[1]")
-        combo_to = table.cellWidget(9,3)
+        combo_to = table.cellWidget(9,4)
         combo_to.setCurrentText("SOIL[4]")
 
         combo_proc = table.cellWidget(10,0)
@@ -145,7 +145,7 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("PERC_LINEAR_ANALYTIC")
         combo_from = table.cellWidget(10,2)
         combo_from.setCurrentText("SOIL[4]")
-        combo_to = table.cellWidget(10,3)
+        combo_to = table.cellWidget(10,4)
         combo_to.setCurrentText("SOIL[5]")
 
         combo_proc = table.cellWidget(11,0)
@@ -154,7 +154,7 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("BASE_LINEAR")
         combo_from = table.cellWidget(11,2)
         combo_from.setCurrentText("SOIL[5]")
-        combo_to = table.cellWidget(11,3)
+        combo_to = table.cellWidget(11,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(12,0)
@@ -163,7 +163,7 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("BASE_LINEAR")
         combo_from = table.cellWidget(12,2)
         combo_from.setCurrentText("SOIL[2]")
-        combo_to = table.cellWidget(12,3)
+        combo_to = table.cellWidget(12,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(13,0)
@@ -172,7 +172,7 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("BASE_LINEAR")
         combo_from = table.cellWidget(13,2)
         combo_from.setCurrentText("SOIL[3]")
-        combo_to = table.cellWidget(13,3)
+        combo_to = table.cellWidget(13,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         combo_proc = table.cellWidget(14,0)
@@ -181,7 +181,7 @@ def loadUbcwm(self):
         combo_alg.setCurrentText("GRELEASE_LINEAR")
         combo_from = table.cellWidget(14,2)
         combo_from.setCurrentText("GLACIER")
-        combo_to = table.cellWidget(14,3)
+        combo_to = table.cellWidget(14,4)
         combo_to.setCurrentText("SURFACE_WATER")
 
         table.resizeColumnsToContents() #Resizes the width of the column automatically
diff --git a/qraven/qraven_dialog_base.ui b/qraven/qraven_dialog_base.ui
index 21789a0..42bbaf4 100644
--- a/qraven/qraven_dialog_base.ui
+++ b/qraven/qraven_dialog_base.ui
@@ -1784,11 +1784,21 @@ color:rgb(170, 170, 170)</string>
                   <string>From</string>
                  </property>
                 </column>
+                <column>
+                 <property name="text">
+                  <string/>
+                 </property>
+                </column>
                 <column>
                  <property name="text">
                   <string>To</string>
                  </property>
                 </column>
+                <column>
+                 <property name="text">
+                  <string/>
+                 </property>
+                </column>
                 <column>
                  <property name="text">
                   <string>Conditional</string>
@@ -2727,7 +2737,7 @@ color:rgb(170, 170, 170)</string>
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>610</width>
+                   <width>905</width>
                    <height>1315</height>
                   </rect>
                  </property>
@@ -4343,7 +4353,7 @@ color:rgb(170, 170, 170)</string>
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>905</width>
+                   <width>337</width>
                    <height>932</height>
                   </rect>
                  </property>
@@ -4732,8 +4742,8 @@ color:rgb(170, 170, 170)</string>
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>311</width>
-               <height>707</height>
+               <width>951</width>
+               <height>760</height>
               </rect>
              </property>
              <layout class="QFormLayout" name="formLayout_2">
@@ -5411,9 +5421,9 @@ color:rgb(170, 170, 170)</string>
  <resources/>
  <connections/>
  <buttongroups>
-  <buttongroup name="buttonGroup_2"/>
   <buttongroup name="buttonGroup_4"/>
-  <buttongroup name="buttonGroup"/>
   <buttongroup name="buttonGroup_3"/>
+  <buttongroup name="buttonGroup_2"/>
+  <buttongroup name="buttonGroup"/>
  </buttongroups>
 </ui>