Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -reca8d3222a8fbcda268c8ea1c004dfe0a7ed30db -r965a35a61959999274bbff47c74e439639d32b1d
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision eca8d3222a8fbcda268c8ea1c004dfe0a7ed30db)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 965a35a61959999274bbff47c74e439639d32b1d)
@@ -338,10 +338,7 @@
     switch ( fillState )
     {
         case DG_FILL_MODE_STATE_START:
-            if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) && ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) )
-            {
-                fillState = DG_FILL_MODE_STATE_TEST_INLET_WATER;
-            }
+            fillState = DG_FILL_MODE_STATE_TEST_INLET_WATER;
             break;
 
         case DG_FILL_MODE_STATE_TEST_INLET_WATER:
@@ -941,21 +938,14 @@
             }
         }
 
-        if ( TRUE == getEmpytBottleDetectedFlag() )
-        {
-            // If the alarm was triggered due to the empty bottle alarm, clear the alarm since we are at the end of the fill
-            // Set the empty bottle flag to false since we are done
-            clearAlarm( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
-            setEmptyBottleDetectedFlag( FALSE );
-        }
-
         // SRSDG 400
         if ( ( FALSE == isValueWithinPercentRange( avgBicarbConduSPerCM, bicarbNormalConduSPerCM, FIVE_PERCENT_FACTOR ) ) &&
              ( getTargetFillVolumeML() > MIN_FILL_TARGET_TO_CHECK_RO_AND_CPO_ML ) && ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
         {
             setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
             setThisFisrtFillFlag( TRUE );
             resetChemicalUsedVolumeML( BICARB );
+            resetChemicalUsedVolumeML( ACID );
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgBicarbConduSPerCM, bicarbNormalConduSPerCM );  // trigger replace bottles alarm #1
             clearAlarm( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );  // clear this alarm before triggering in case previous fill was bad and still active from before
             activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );