Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rea668c42924e251378d886d2ef1f74bddb1f8456 -r9f269e078e888d29faaa16d1e5c287302cf70c90
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision ea668c42924e251378d886d2ef1f74bddb1f8456)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 9f269e078e888d29faaa16d1e5c287302cf70c90)
@@ -23,6 +23,7 @@
 #include "ModePreTreat.h"
 #include "OperationModes.h"
 #include "StatePreTxRecirculate.h"
+#include "SyringePump.h"
 #include "Timers.h"
 #include "TubeSetInstall.h"
 #include "TxParams.h"
@@ -43,9 +44,6 @@
 // ********** private function prototypes **********
 
 static void setPreTreatStateTransition( void );                                 ///< Configure actuators and variables for Pre-Treatment state transitions.
-static TD_PRE_TREATMENT_MODE_STATE_T handleWaterSampleState( void );            ///< Handle Water Sample state during Pre-Treatment
-static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestConsumableState( void );     ///< Handle Self Test Consumable state during Pre-Treatment
-static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestNoCartState( void );         ///< Handle Self Test No Cart state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handleInstallState( void );                ///< Handle Install state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestDryState( void );            ///< Handle Self Test Dry state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handlePrimeState( void );                  ///< Handle Prime state during Pre-Treatment
@@ -168,7 +166,9 @@
     switch ( currentPreTreatmentState )
     {
         case TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE:
-            // H4, H1, H19 and H5 are controlled by the Tube Set Install Service.
+            // H4 and H5 are controlled by the Tube Set Install Service.
+            setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
+            setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT );
             setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
             set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
@@ -324,6 +324,13 @@
         {
             presUFVolumeL = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
             presUFRateMlMin = ( presUFVolumeL * (F32)ML_PER_LITER ) / (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
+            // Direct DD to generate dialysate and bypass while priming blood
+            cmdStartGenerateDialysate( (F32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presUFRateMlMin,
+                                       getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ), TRUE,
+                                       getTreatmentParameterF32( TREATMENT_PARAM_ACID_CONCENTRATE_CONV_FACTOR ),
+                                       bicarbConvFactor,
+                                       getTreatmentParameterU32( TREATMENT_PARAM_SODIUM ),
+                                       getTreatmentParameterU32( TREATMENT_PARAM_BICARBONATE ) );
         }
 
         state = TD_PRE_TREATMENT_RECIRCULATE_STATE;
Index: firmware/App/Services/StateServices/TubeSetInstall.h
===================================================================
diff -u -rce9145f506c3b7b970285bf2ab2e464b66f83bab -r9f269e078e888d29faaa16d1e5c287302cf70c90
--- firmware/App/Services/StateServices/TubeSetInstall.h	(.../TubeSetInstall.h)	(revision ce9145f506c3b7b970285bf2ab2e464b66f83bab)
+++ firmware/App/Services/StateServices/TubeSetInstall.h	(.../TubeSetInstall.h)	(revision 9f269e078e888d29faaa16d1e5c287302cf70c90)
@@ -48,12 +48,12 @@
 
 // ********** public function prototypes **********
 
-void initTubeSetInstall( void );                                    // Initialize this service
-void execTubeSetInstall( void );                                    // Execute the service state machine (call from ModePreTreat and ModeTreatment)
+void initTubeSetInstall( void );                                         // Initialize this service
+void execTubeSetInstall( void );                                         // Execute the service state machine (call from ModePreTreat and ModeTreatment)
 
-BOOL isTubeSetInstallComplete( void );                                       // Returns True once auto-load finished successfully
-BOOL handleAutoLoadRequest( MESSAGE_T *message );                            // Handle UI auto-load confirmation request
-BOOL handleSetupTubingSetConnectionConfirmRequest( MESSAGE_T *message );     // Handle UI setup tubing set connection confirmation request
+BOOL isTubeSetInstallComplete( void );                                   // Returns True once auto-load finished successfully
+BOOL handleAutoLoadRequest( MESSAGE_T *message );                        // Handle UI auto-load confirmation request
+BOOL handleSetupTubingSetConnectionConfirmRequest( MESSAGE_T *message ); // Handle UI setup tubing set connection confirmation request
 
 /**@}*/
 
Index: firmware/App/Services/TxParams.h
===================================================================
diff -u -rce9145f506c3b7b970285bf2ab2e464b66f83bab -r9f269e078e888d29faaa16d1e5c287302cf70c90
--- firmware/App/Services/TxParams.h	(.../TxParams.h)	(revision ce9145f506c3b7b970285bf2ab2e464b66f83bab)
+++ firmware/App/Services/TxParams.h	(.../TxParams.h)	(revision 9f269e078e888d29faaa16d1e5c287302cf70c90)
@@ -171,7 +171,7 @@
 typedef struct
 {
     U32 arterialPressureLimitWindowMMHG;                                ///< Arterial pressure limit window in mmHg.
-    U32 venousHighPressureLimitWindowMMHG;;                             ///< Venous high pressure limit window in mmHg.
+    U32 venousHighPressureLimitWindowMMHG;                              ///< Venous high pressure limit window in mmHg.
     U32 venousLowPressureLimitWindowMMHG;                               ///< Venous low pressure limit window in mmHg.
     U32 tmpPressureLimitWindowMMHG;                                     ///< TMP pressure limit window in mmHg.
 } PRESSURE_LIMIT_CHANGE_REQUEST_T;