Index: firmware/App/Modes/StateTxDialysis.c
===================================================================
diff -u -r6f02ff4686ec9dfc60247e9ed3fc9c5cc7771543 -rc92e2b5ae61f359e5633b32b2d5b691347d0d293
--- firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision 6f02ff4686ec9dfc60247e9ed3fc9c5cc7771543)
+++ firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision c92e2b5ae61f359e5633b32b2d5b691347d0d293)
@@ -7,8 +7,8 @@
 *
 * @file    StateTxDialysis.c
 *
-* @author  (last)      Varshini Nagabooshanam
-* @date    (last)      26-Jan-2026
+* @author  (last)      Raghu Kallala
+* @date    (last)      17-Apr-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  21-Apr-2025
@@ -101,9 +101,11 @@
  *************************************************************************/
 void transitionToDialysis( void )
 {
-    F32 dialTemp = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
-    U32 acidType = getTreatmentParameterU32( TREATMENT_PARAM_ACID_CONCENTRATE );
-    U32 bicbType = getTreatmentParameterU32( TREATMENT_PARAM_BICARB_CONCENTRATE );
+    F32 dialTemp         = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
+    F32 acidConvFactor   = getTreatmentParameterF32( TREATMENT_PARAM_ACID_CONCENTRATE_CONV_FACTOR );
+    F32 bicarbConvFactor = BICARBONATE_CONVERSION_FACTOR;
+    U32 sodium           = getTreatmentParameterU32( TREATMENT_PARAM_SODIUM );
+    U32 bicarbonate      = getTreatmentParameterU32( TREATMENT_PARAM_BICARBONATE );
 
     doorClosedRequired( TRUE );
 
@@ -114,7 +116,7 @@
 
     // Set actuators as appropriate for state
     cmdStartGenerateDialysate( setDialysateFlowRate, setUFRateLHr, dialTemp, FALSE,
-                               (ACID_CONCENTRATE_TYPE_T)acidType, (BICARB_CONCENTRATE_TYPE_T)bicbType );
+                               acidConvFactor, bicarbConvFactor, sodium, bicarbonate  );
     transitionToDialysisState( currentDialysisState );
 
     // Set substate for event
@@ -231,17 +233,17 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The signalPauseResumeUF function handles a request to pause or resume
- * ultrafiltration.
- * @details \b Message \b Sent: MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE
- * @details \b Message \b Sent: UF_START_PAUSE_EVENT / UF_START_RESUME_EVENT
- * @details \b Inputs: currentDialysisState, setUFRateLHr
- * @details \b Outputs: ufPauseRequested, ufResumeRequested
- * @param message Message from UI which includes a flag indicating whether
- * to pause or resume ultrafiltration.
- * @return TRUE if pause
- *************************************************************************/
+* @brief
+* The signalPauseResumeUF function handles a request to pause or resume
+* ultrafiltration.
+* @details \b Message \b Sent: MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE
+* @details \b Message \b Sent: UF_START_PAUSE_EVENT / UF_START_RESUME_EVENT
+* @details \b Inputs: currentDialysisState, setUFRateLHr
+* @details \b Outputs: ufPauseRequested, ufResumeRequested
+* @param message Message from UI which includes a flag indicating whether
+* to pause or resume ultrafiltration.
+* @return TRUE if pause
+*************************************************************************/
 BOOL signalPauseResumeUF( MESSAGE_T *message )
 {
     TREATMENT_STATE_T trtState = getTreatmentState();