Index: firmware/App/Controllers/Ultrafiltration.c
===================================================================
diff -u -r3f65e4b1e11315bd6ca3a30a80fd4848a9081dda -r51874695d7cd2547212e86ad7363ff9e515ec38b
--- firmware/App/Controllers/Ultrafiltration.c	(.../Ultrafiltration.c)	(revision 3f65e4b1e11315bd6ca3a30a80fd4848a9081dda)
+++ firmware/App/Controllers/Ultrafiltration.c	(.../Ultrafiltration.c)	(revision 51874695d7cd2547212e86ad7363ff9e515ec38b)
@@ -110,7 +110,16 @@
         // Compensate balancing error at defined interval
         UpdateUFCompensation();
     }
+    else if ( TRUE == isUFRateUpdated )
+    {
+        //get updated UF rate
+        compUFrate = getTDUFRate();
 
+        // Update UF rate
+        setConcentratePumpTargetSpeed( D76_PUMP, compUFrate, DOSING_CONT_VOLUME );
+        isUFRateUpdated      = FALSE;
+    }
+
     // execute current ultrafiltration exec state
     switch ( ufExecState )
     {
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rd66ded5492dd8a760b235b12cb6767f0427ba573 -r51874695d7cd2547212e86ad7363ff9e515ec38b
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision d66ded5492dd8a760b235b12cb6767f0427ba573)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 51874695d7cd2547212e86ad7363ff9e515ec38b)
@@ -227,7 +227,7 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            setHeaterTargetTemperature( D45_HEAT, getTDTargetDialysateTemperature() );
+            setHeaterTargetTemperature( D45_HEAT,  getD4AverageTemperature() );
             startHeater( D45_HEAT );
 
             //Testing : Enable close loop once testing is complete
@@ -260,7 +260,7 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            setHeaterTargetTemperature( D45_HEAT, getTDTargetDialysateTemperature() );
+            setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
             startHeater( D45_HEAT );
 
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );
@@ -483,7 +483,7 @@
     BOOL result                         = FALSE;
     LEVEL_STATE_T floaterLevel          = getLevelStatus( D6_LEVL );
     BOOL balancingChambFillInProgress   = getBalancingChamberFillinProgressStatus();
-
+#if 0
     // High level is met
     if ( LEVEL_STATE_HIGH == floaterLevel )
     {
@@ -498,7 +498,23 @@
         // if level is not met,allow inlet water to hydraulics chamber
         setValveState( D3_VALV, VALVE_STATE_OPEN );
     }
+#else
+    // High level is met
+    if ( LEVEL_STATE_HIGH == floaterLevel )
+    {
+        //turn off inlet water valve
+        setValveState( D3_VALV, VALVE_STATE_CLOSED );
 
+        // Water level reached high.
+        result = TRUE;
+    }
+    else
+    {
+        // if level is not met,allow inlet water to hydraulics chamber
+        setValveState( D3_VALV, VALVE_STATE_OPEN );
+    }
+#endif
+
     return result;
 }
 
Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -r1d22a723272b4225b10b296c25339bdc90b4236d -r51874695d7cd2547212e86ad7363ff9e515ec38b
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 1d22a723272b4225b10b296c25339bdc90b4236d)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 51874695d7cd2547212e86ad7363ff9e515ec38b)
@@ -265,6 +265,7 @@
     U32 fpgaD11PumpHallSense;                   ///< Reg 760. Concentrate pump D11_Pump hall sensor pulse width
     U32 fpgaD10PumpHallSense;                   ///< Reg 764. Concentrate pump D10_Pump hall sensor pulse width
     U32 fpgaD76PumpHallSense;                   ///< Reg 768. UF D76_Pump hall sensor pulse width
+    U32 fpgaTestBytes;                          ///< Reg 772. FPGA Test 4 bytes
 } DD_FPGA_SENSORS_T;
 
 typedef struct