Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
===================================================================
diff -u -re8a6b6eaa4360f9d4272371bbb7c026ce9c13081 -rca43b0285ec853d03be20103c6e0e0d9af86fd0a
--- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml	(.../PreTreatmentPrimeStack.qml)	(revision e8a6b6eaa4360f9d4272371bbb7c026ce9c13081)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml	(.../PreTreatmentPrimeStack.qml)	(revision ca43b0285ec853d03be20103c6e0e0d9af86fd0a)
@@ -102,7 +102,7 @@
         checkListStepNames      : [
             qsTr("Blood Circuit Priming"    ),
             qsTr("Dialysate Circuit Priming"),
-            qsTr("Wet Self Tests"           ),
+            qsTr("Wet Self Tests"           )
         ]
     }
 
@@ -129,18 +129,37 @@
     Connections { target: vPreTreatmentStates
         function onPrimeChanged                                     ( vValue ) { page( _preTreatmentDisposablesPrime                 , vValue       )}
         function onPrime_waitUserStartEntered                       ( vValue ) {}
-        function onPrime_salineSetupEntered                         ( vValue ) { _preTreatmentDisposablesPrime   .checkList.setItem(0, true         )}
+        function onPrime_salineSetupEntered                         ( vValue ) {}
         function onPrime_salinePurgeAirEntered                      ( vValue ) {}
-        function onPrime_salineCirculateBloodCircuitEntered         ( vValue ) { _preTreatmentDisposablesPrime   .checkList.setItem(0, vValue       )}
-        function onPrime_reservoiOneFillCompleteEntered             ( vValue ) { _preTreatmentDisposablesPrime   .checkList.setItem(1, true         )}
+        function onPrime_salineCirculateBloodCircuitEntered         ( vValue ) {}
+        function onPrime_reservoiOneFillCompleteEntered             ( vValue ) {}
         function onPrime_dialysateDialyzerEntered                   ( vValue ) {}
         function onPrime_salineDialyzerSetupEntered                 ( vValue ) {}
         function onPrime_salineDialyzerEntered                      ( vValue ) {}
         function onPrime_reservoirTwoFillCompleteEntered            ( vValue ) {}
-        function onPrime_dialysateBypassEntered                     ( vValue ) { _preTreatmentDisposablesPrime   .checkList.setItem(1, vValue       )}
-        function onPrime_wetSelfTestsEntered                        ( vValue ) { _preTreatmentDisposablesPrime   .checkList.setItem(2, vValue       )}
+        function onPrime_dialysateBypassEntered                     ( vValue ) {}
+        function onPrime_wetSelfTestsEntered                        ( vValue ) {}
         function onPrime_pauseEntered                               ( vValue ) {}
         function onPrime_completeEntered                            ( vValue ) {}
+
+        //TODO  this way of handling the states are new for states which can reset to the previous states
+        // if it is successfull I may use everywhere.
+        // 1 - it uses new setItemExt
+        // 2 - bundles the states of FW in UI states
+        // setitem differences.
+        // old:
+        // 1 - the start FW state of the UI state set to true
+        // 2 - the end FW state fo the UI state set with vValue
+        // 3 - nothing for the FW in-states of the UI states
+        // new:
+        // - all set with vValue and use the  setItemExt
+        // Unkown missbehavior:
+        // - the only misbehavior is if the FW changes the FW state in the middle (in one of in-states),
+        //   since UI budles the FW states, it assumes it is done and checks the state which may not be ideal.
+        //   as an example if during the Dyalysate FW changes th state to the pause, UI may not show the Dialysaate done (probably!).
+        function onPrime__BloodCircuitEntered                       ( vValue ) { _preTreatmentDisposablesPrime   .checkList.setItemExt(0, vValue    )}
+        function onPrime__DialysateCircuitEntered                   ( vValue ) { _preTreatmentDisposablesPrime   .checkList.setItemExt(1, vValue    )}
+        function onPrime__WetSelfTestsEntered                       ( vValue ) { _preTreatmentDisposablesPrime   .checkList.setItemExt(2, vValue    )}
     }
 
     Connections { target: vPreTreatmentAdjustmentDisposablesPrime