Index: simulator/plugins/createtreatment/loader.py
===================================================================
diff -u -red2d7cb5c8c2059444fd17cd4e1c0975461a903c -r6f84fdb12153d7d74fee34bcca613fac1af72464
--- simulator/plugins/createtreatment/loader.py	(.../loader.py)	(revision ed2d7cb5c8c2059444fd17cd4e1c0975461a903c)
+++ simulator/plugins/createtreatment/loader.py	(.../loader.py)	(revision 6f84fdb12153d7d74fee34bcca613fac1af72464)
@@ -75,7 +75,10 @@
         :return: none
         """
         self.hd_simulator.cmd_send_treatment_parameter_manual_validation_response([
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+            1,
+               0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0
         ])
         self.lblCreateAction.setText('Accepted ')
 
@@ -86,8 +89,12 @@
         :return: none
         """
         reason = self.spnCreateRejectReason.value()
+        print(reason)
         self.hd_simulator.cmd_send_treatment_parameter_manual_validation_response([
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+            reason,
+               0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0
         ])
         self.lblCreateAction.setText('Rejected ' + "{}".format(reason))
 
Index: simulator/plugins/disposablesPrime/interface.ui
===================================================================
diff -u -reb6acf9c1a4748852875c350568192999be9d3dd -r6f84fdb12153d7d74fee34bcca613fac1af72464
--- simulator/plugins/disposablesPrime/interface.ui	(.../interface.ui)	(revision eb6acf9c1a4748852875c350568192999be9d3dd)
+++ simulator/plugins/disposablesPrime/interface.ui	(.../interface.ui)	(revision 6f84fdb12153d7d74fee34bcca613fac1af72464)
@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>&amp;2 Pre-Treatment/&amp;Disposables Prime</string>
+   <string>&amp;2 Pre-Treatment/&amp;5 Disposables Prime</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <property name="leftMargin">
Index: simulator/plugins/pretreatmentstates/interface.ui
===================================================================
diff -u -r68ba5188e33d6f05936fb77626822f416b9abb37 -r6f84fdb12153d7d74fee34bcca613fac1af72464
--- simulator/plugins/pretreatmentstates/interface.ui	(.../interface.ui)	(revision 68ba5188e33d6f05936fb77626822f416b9abb37)
+++ simulator/plugins/pretreatmentstates/interface.ui	(.../interface.ui)	(revision 6f84fdb12153d7d74fee34bcca613fac1af72464)
@@ -71,7 +71,7 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>-479</y>
+        <y>0</y>
         <width>650</width>
         <height>1515</height>
        </rect>
@@ -784,12 +784,12 @@
          </item>
          <item row="8" column="0">
           <property name="text">
-           <string>NO_CART_SELF_TESTS_DOOR_SWITCH_STATE</string>
+           <string>NO_CART_SELF_TESTS_START_HOMING_STATE</string>
           </property>
          </item>
          <item row="8" column="1">
           <property name="text">
-           <string>No cartridge door switch self-test state.</string>
+           <string>No cartridge start home valves and pumps state.</string>
           </property>
          </item>
          <item row="9" column="0">
@@ -1016,11 +1016,6 @@
            <string>8</string>
           </property>
          </row>
-         <row>
-          <property name="text">
-           <string>9</string>
-          </property>
-         </row>
          <column>
           <property name="text">
            <string>HD_Pre_Treatment_Dry_Self_Tests_States</string>
@@ -1053,81 +1048,71 @@
          </item>
          <item row="2" column="0">
           <property name="text">
-           <string>DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE</string>
+           <string>DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE</string>
           </property>
          </item>
          <item row="2" column="1">
           <property name="text">
-           <string>Bubble detectors dry self-test state.</string>
+           <string>Used cartridge self-test state.</string>
           </property>
          </item>
          <item row="3" column="0">
           <property name="text">
-           <string>DRY_SELF_TESTS_AIR_TRAP_STATE</string>
+           <string>DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE</string>
           </property>
          </item>
          <item row="3" column="1">
           <property name="text">
-           <string>Air trap fill level ultrasonic sensor dry self-test state.</string>
+           <string>Occlusion sensors dry self-test state.</string>
           </property>
          </item>
          <item row="4" column="0">
           <property name="text">
-           <string>DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE</string>
+           <string>DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE</string>
           </property>
          </item>
          <item row="4" column="1">
           <property name="text">
-           <string>Occlusion sensors dry self-test state.</string>
+           <string>Pressure sensors dry self-test setup valves and pump state.</string>
           </property>
          </item>
          <item row="5" column="0">
           <property name="text">
-           <string>DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE</string>
+           <string>DRY_SELF_TESTS_PRESSURE_SENSORS_STATE</string>
           </property>
          </item>
          <item row="5" column="1">
           <property name="text">
-           <string>Pressure sensors dry self-test setup valves and pump state.</string>
+           <string>Pressure sensors verify pressure readings state.</string>
           </property>
          </item>
          <item row="6" column="0">
           <property name="text">
-           <string>DRY_SELF_TESTS_PRESSURE_SENSORS_STATE</string>
+           <string>DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE</string>
           </property>
          </item>
          <item row="6" column="1">
           <property name="text">
-           <string>Pressure sensors verify pressure readings state.</string>
+           <string>Preassure sensors verify normal pressure readings state.</string>
           </property>
          </item>
          <item row="7" column="0">
           <property name="text">
-           <string>DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE</string>
+           <string>DRY_SELF_TESTS_STOPPED_STATE</string>
           </property>
          </item>
          <item row="7" column="1">
           <property name="text">
-           <string>Preassure sensors verify normal pressure readings state.</string>
+           <string>Dry self-test stopped state.</string>
           </property>
          </item>
          <item row="8" column="0">
           <property name="text">
-           <string>DRY_SELF_TESTS_STOPPED_STATE</string>
+           <string>DRY_SELF_TESTS_COMPLETE_STATE</string>
           </property>
          </item>
          <item row="8" column="1">
           <property name="text">
-           <string>Dry self-test stopped state.</string>
-          </property>
-         </item>
-         <item row="9" column="0">
-          <property name="text">
-           <string>DRY_SELF_TESTS_COMPLETE_STATE</string>
-          </property>
-         </item>
-         <item row="9" column="1">
-          <property name="text">
            <string>Dry self-test complete state.</string>
           </property>
          </item>
Index: simulator/plugins/selftestDry/interface.ui
===================================================================
diff -u -reb6acf9c1a4748852875c350568192999be9d3dd -r6f84fdb12153d7d74fee34bcca613fac1af72464
--- simulator/plugins/selftestDry/interface.ui	(.../interface.ui)	(revision eb6acf9c1a4748852875c350568192999be9d3dd)
+++ simulator/plugins/selftestDry/interface.ui	(.../interface.ui)	(revision 6f84fdb12153d7d74fee34bcca613fac1af72464)
@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>&amp;2 Pre-Treatment/&amp;Self Test Dry</string>
+   <string>&amp;2 Pre-Treatment/&amp;4 Self Test Dry</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <property name="leftMargin">
Index: simulator/plugins/selftestNoCartridge/interface.ui
===================================================================
diff -u -reb6acf9c1a4748852875c350568192999be9d3dd -r6f84fdb12153d7d74fee34bcca613fac1af72464
--- simulator/plugins/selftestNoCartridge/interface.ui	(.../interface.ui)	(revision eb6acf9c1a4748852875c350568192999be9d3dd)
+++ simulator/plugins/selftestNoCartridge/interface.ui	(.../interface.ui)	(revision 6f84fdb12153d7d74fee34bcca613fac1af72464)
@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>&amp;2 Pre-Treatment/&amp;Self Test No Cartridge</string>
+   <string>&amp;2 Pre-Treatment/&amp;3 Self Test No Cartridge</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <property name="leftMargin">
Index: simulator/plugins/treatmentstates/interface.ui
===================================================================
diff -u -reb6acf9c1a4748852875c350568192999be9d3dd -r6f84fdb12153d7d74fee34bcca613fac1af72464
--- simulator/plugins/treatmentstates/interface.ui	(.../interface.ui)	(revision eb6acf9c1a4748852875c350568192999be9d3dd)
+++ simulator/plugins/treatmentstates/interface.ui	(.../interface.ui)	(revision 6f84fdb12153d7d74fee34bcca613fac1af72464)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>526</width>
-    <height>618</height>
+    <height>638</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -300,16 +300,6 @@
          <string>2</string>
         </property>
        </row>
-       <row>
-        <property name="text">
-         <string>3</string>
-        </property>
-       </row>
-       <row>
-        <property name="text">
-         <string>4</string>
-        </property>
-       </row>
        <column>
         <property name="text">
          <string>UF States</string>
@@ -330,16 +320,6 @@
          <string>UF_RUNNING_STATE</string>
         </property>
        </item>
-       <item row="3" column="0">
-        <property name="text">
-         <string>UF_OFF_STATE</string>
-        </property>
-       </item>
-       <item row="4" column="0">
-        <property name="text">
-         <string>UF_COMPLETED_STATE</string>
-        </property>
-       </item>
       </widget>
      </item>
      <item row="2" column="0">
@@ -440,7 +420,7 @@
        <property name="minimumSize">
         <size>
          <width>225</width>
-         <height>155</height>
+         <height>175</height>
         </size>
        </property>
        <property name="font">
@@ -508,6 +488,11 @@
          <string>5</string>
         </property>
        </row>
+       <row>
+        <property name="text">
+         <string>6</string>
+        </property>
+       </row>
        <column>
         <property name="text">
          <string>Heparin States</string>
@@ -523,26 +508,31 @@
        </item>
        <item row="1" column="0">
         <property name="text">
-         <string>HEPARIN_STATE_PAUSED</string>
+         <string>HEPARIN_STATE_STOPPED</string>
         </property>
        </item>
        <item row="2" column="0">
         <property name="text">
-         <string>HEPARIN_STATE_INITIAL_BOLUS</string>
+         <string>HEPARIN_STATE_PAUSED</string>
         </property>
        </item>
        <item row="3" column="0">
         <property name="text">
-         <string>HEPARIN_STATE_DISPENSING</string>
+         <string>HEPARIN_STATE_INITIAL_BOLUS</string>
         </property>
        </item>
        <item row="4" column="0">
         <property name="text">
-         <string>HEPARIN_STATE_COMPLETED</string>
+         <string>HEPARIN_STATE_DISPENSING</string>
         </property>
        </item>
        <item row="5" column="0">
         <property name="text">
+         <string>HEPARIN_STATE_COMPLETED</string>
+        </property>
+       </item>
+       <item row="6" column="0">
+        <property name="text">
          <string>HEPARIN_STATE_EMPTY</string>
         </property>
        </item>