Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r97020684e7dcc52fa1d9dc10a97e6a98c3d3c81a -r87467f3b071eae26bc855e20e718acb159c648bb
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 97020684e7dcc52fa1d9dc10a97e6a98c3d3c81a)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 87467f3b071eae26bc855e20e718acb159c648bb)
@@ -7,8 +7,8 @@
 *
 * @file    ModeFill.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      10-Aug-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      16-Aug-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  19-Nov-2019
@@ -195,7 +195,7 @@
 
     acidMixRatio                  = acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidConcMixRatio;
     bicarbMixRatio                = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio;
-    fillState                     = DG_FILL_MODE_STATE_START;
+    fillState                     = DG_FILL_MODE_STATE_TEST_INLET_WATER;
     dialysateFillStartTimeMS      = 0;
     dataPublishCounter            = DATA_PUBLISH_COUNTER_START_COUNT;
     reservoirBaseWeight           = 0.0F;
@@ -336,10 +336,6 @@
     // Execute current Fill state
     switch ( fillState )
     {
-        case DG_FILL_MODE_STATE_START:
-            fillState = DG_FILL_MODE_STATE_TEST_INLET_WATER;
-            break;
-
         case DG_FILL_MODE_STATE_TEST_INLET_WATER:
             fillState = handleTestInletWaterState();
             break;
@@ -374,7 +370,7 @@
 
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_FILL_MODE_INVALID_EXEC_STATE, fillState )
-            fillState = DG_FILL_MODE_STATE_START;
+            fillState = DG_FILL_MODE_STATE_TEST_INLET_WATER;
             break;
     }
 
@@ -983,7 +979,7 @@
     if ( ( FALSE == areInletWaterConditionsAlarmsActive() ) && ( FALSE == areConductivityAlarmsActive() ) )
     {
         havePauseActuatorsBeenSet = FALSE;
-        result                    = DG_FILL_MODE_STATE_START;
+        result                    = DG_FILL_MODE_STATE_TEST_INLET_WATER;
     }
 
     return result;
@@ -1005,7 +1001,6 @@
 {
     switch( state )
     {
-        case DG_FILL_MODE_STATE_START:
         case DG_FILL_MODE_STATE_TEST_INLET_WATER:
             // Do nothing
             break;