Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r069dee3a2428d3c6bb281db1844a372ae6e2063a -re4eceb1ac6e8091d10e0fab49d2d5a9c5e5f1c67
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 069dee3a2428d3c6bb281db1844a372ae6e2063a)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision e4eceb1ac6e8091d10e0fab49d2d5a9c5e5f1c67)
@@ -130,8 +130,7 @@
             break;
 
         case TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE:
-            currentPreTreatmentState = TD_PRE_TREATMENT_HEPARIN_SETUP_STATE;
-            setCurrentSubState((U32)currentPreTreatmentState);
+            currentPreTreatmentState = handleInstallState();
             break;
 
         case TD_PRE_TREATMENT_SELF_TEST_DRY_STATE:
@@ -353,7 +352,7 @@
     BOOL paramsValid                       = getValidTreatParamsReceived();
     BOOL paramsConfirmed                   = getTreatParamsConfirmed();
     BOOL heparinIsPrescribed               = ( ( getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ) > 0.0F ) ||
-                                               ( getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DELIVERY_RATE ) > 0.0F ) ) ? TRUE : FALSE;
+                                               ( getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DELIVERY_RATE ) > 0.0F ) );
     BOOL isDialysateGoodToDeliver          = TRUE;     // TODO replace TRUE with getDialysateGoodToDeliverStatus() when we are ready
     F32 bicarbConvFactor                   = BICARBONATE_CONVERSION_FACTOR;
     F32 presUFVolumeL                      = 0.0F;