Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rbfb859737f3d221f08c0f43d1bd4ba7b7680911f -r113f60c96d311d25658fe7a3895adf5c3734d16f
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision bfb859737f3d221f08c0f43d1bd4ba7b7680911f)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 113f60c96d311d25658fe7a3895adf5c3734d16f)
@@ -8,13 +8,14 @@
 * @file    ModePreTreat.c
 *
 * @author  (last)      Praneeth Bunne
-* @date    (last)      19-May-2026
+* @date    (last)      04-Jun-2026
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  25-Sep-2025
 *
 ***************************************************************************/
 
+#include "BloodFlow.h"
 #include "Buttons.h"
 #include "DrySelfTests.h"
 #include "DDInterface.h"
@@ -24,6 +25,8 @@
 #include "Timers.h"
 #include "TubeSetInstall.h"
 #include "TxParams.h"
+#include "Valves.h"
+
 /**
  *  @addtogroup TDPreTreatmentMode
  *  @{
@@ -56,15 +59,15 @@
 /*********************************************************************//**
 * @brief
 * The initPreTreatmentMode function initializes the Pre-Treatment mode.
-* @details \b Inputs: none
-* @details \b Outputs: Resets the Treatment Parameters session and sets the initial
+* @details Inputs: none
+* @details Outputs: Initializes the Treatment Parameters session and sets the initial
 * Pre-Treatment sub-state.
 * @return none
 **************************************************************************/
 void initPreTreatmentMode( void )
 {
     // Start a fresh Treatment Parameters session for this run.
-    resetTreatmentParameters();
+    initTreatmentParameters();
     currentPreTreatmentState  = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
     goToInstallStateRequested = FALSE;
 }
@@ -83,6 +86,13 @@
     initPreTreatmentMode();
     initTubeSetInstall();
 
+    // TODO: remove after implementing blood pump homing in some state
+    homeBloodPump();
+
+    // TODO: remove these homeValve() when SELF_TEST_NO_CART_STATE is implemented (homing valves is handled over there).
+    homeValve(H1_VALV, FALSE, FALSE);
+    homeValve(H19_VALV, FALSE, FALSE);
+
     return (U32)currentPreTreatmentState;
 }