Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -r98865667298d58132b40bceda1305b6bbc2204e0 -r02c2059fd465609e56c6240d2855c91be2129fd6
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision 98865667298d58132b40bceda1305b6bbc2204e0)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision 02c2059fd465609e56c6240d2855c91be2129fd6)
@@ -331,33 +331,28 @@
  *************************************************************************/
 LEVEL_STATE_T getBicarbChamberLevelStatus( void )
 {
-    LEVEL_STATE_T status     = LEVEL_STATE_ILLEGAL;
-    BOOL          upperlevel = FALSE;
-    BOOL          lowerlevel = FALSE;
+   LEVEL_STATE_T status = LEVEL_STATE_ILLEGAL;
+   LEVEL_STATE_T upperlevel = getLevelStatus( D63_LEVL );
+   LEVEL_STATE_T lowerlevel = getLevelStatus( D98_LEVL );
 
-    // These FPGA reads are raw counts
-    upperlevel = processLevelCount( getFPGAD63LevelSensor() );
-    lowerlevel = processLevelCount( getFPGAD98LevelSensor() );
-
-    if ( ( FALSE == lowerlevel ) && ( FALSE == upperlevel ) )
-    {
-        status = LEVEL_STATE_LOW;
-    }
-    else if ( ( TRUE == lowerlevel ) && ( FALSE == upperlevel ) )
-    {
-        status = LEVEL_STATE_MEDIUM;
-    }
-    else if ( ( TRUE == lowerlevel ) && ( TRUE == upperlevel ) )
-    {
-        status = LEVEL_STATE_HIGH;
-    }
-    else
-    {
-        // upperlevel == TRUE while lowerlevel == FALSE - illegal
-        status = LEVEL_STATE_ILLEGAL;
-    }
-
-    return status;
+   if ( ( lowerlevel == LEVEL_STATE_LOW ) && ( upperlevel == LEVEL_STATE_LOW ) )
+   {
+       status = LEVEL_STATE_LOW;
+   }
+   else if ( ( lowerlevel == LEVEL_STATE_HIGH ) && ( upperlevel == LEVEL_STATE_LOW ) )
+   {
+       status = LEVEL_STATE_MEDIUM;
+   }
+   else if ( ( lowerlevel == LEVEL_STATE_HIGH ) && ( upperlevel == LEVEL_STATE_HIGH ) )
+   {
+       status = LEVEL_STATE_HIGH;
+   }
+   else
+   {
+       // upperlevel == TRUE while lowerlevel == FALSE - illegal
+       status = LEVEL_STATE_ILLEGAL;
+   }
+   return status;
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -r98865667298d58132b40bceda1305b6bbc2204e0 -r02c2059fd465609e56c6240d2855c91be2129fd6
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 98865667298d58132b40bceda1305b6bbc2204e0)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 02c2059fd465609e56c6240d2855c91be2129fd6)
@@ -187,7 +187,7 @@
     U16 fpgaD98LevelSensor;                     ///< Reg 622. Lower level Sensor
     U16 fpgaD12MeasuredSpeed;                   ///< Reg 624. Fresh dialysate pump measured speed
     U16 fpgaD48MeasuredSpeed;                   ///< Reg 626. Spent dialysate pump measured speed
-    U08 fpgaRTDReadCnt;                          ///< Reg 628. Read count for all RTD sensors
+    U08 fpgaRTDReadCnt;                         ///< Reg 628. Read count for all RTD sensors
     U08 fpgaD12D48PumpStatus;                   ///< Reg 629. Dialysate pumps Error status
     U16 fpgaD12CurrentFeedback;                 ///< Reg 630. Fresh dialysate pump current feedback
     U16 fpgaD48CurrentFeedback;                 ///< Reg 632. Spent dialysate pump current feedback