Index: SDDs/Pre-Treatment.png
===================================================================
diff -u -ra7aab61ca63538c37b6931c60252680fc2ec2416 -rdfdd08b0283fe7563c15bed670803bfe7dfaf3e9
Binary files differ
Index: SDDs/Pre-Treatment.puml
===================================================================
diff -u -ra7aab61ca63538c37b6931c60252680fc2ec2416 -rdfdd08b0283fe7563c15bed670803bfe7dfaf3e9
--- SDDs/Pre-Treatment.puml	(.../Pre-Treatment.puml)	(revision a7aab61ca63538c37b6931c60252680fc2ec2416)
+++ SDDs/Pre-Treatment.puml	(.../Pre-Treatment.puml)	(revision dfdd08b0283fe7563c15bed670803bfe7dfaf3e9)
@@ -91,28 +91,12 @@
     UI -> US: ACT: Show Prime State
     US -> UI: Act: Press Next
     alt #CEFAD0 Next
-        alt #CAE9F5 Is Water Sample Featured
-            UI -> UI: ACT: Go to Water Sample 
-            UI -> US: ACT: Show Water Sample 
-            US -> UI: TCH: Select pass or fail
-            US -> UI: Act: Press Next
-            alt #CEFAD0 Next Button
-                UI -> UI: ACT: Go to Create Rx
-            end
-        else 
-            UI -> UI: ACT: Go to Create Rx
-        end
+        UI -> UI: ACT: Go to Create Rx
     end
 
     UI -> US: ACT: Show Create Rx
     !include common_puml/CreateRxCommon.puml
-    UI -> UI: ACT: Go to UF/ Dialysate 
-    UI -> US: ACT: Show UF/ Dialysate
-    US -> UI: Act: Press Next
-    alt #CEFAD0 Next
-        UI -> UI: ACT: Go to Connect Page
-    end        
-    UI -> UI: ACT: Go to Connect 
+    UI -> UI: ACT: Go to Connect Page
     UI -> US: ACT: Show Connect
         UI -> UI: ACT: Highlight instruction step \
                 \n\tShow image for instruction step
Index: SDDs/WaterSample.png
===================================================================
diff -u
Binary files differ
Index: SDDs/WaterSampleDialog.puml
===================================================================
diff -u
--- SDDs/WaterSampleDialog.puml	(revision 0)
+++ SDDs/WaterSampleDialog.puml	(revision dfdd08b0283fe7563c15bed670803bfe7dfaf3e9)
@@ -0,0 +1,53 @@
+@startuml WaterSample
+
+    participant TD                  as TD
+    participant SW                  as SW
+    participant UI                  as UI
+    actor       USER                as US
+
+    'Possible actions and interaction types
+    ' External on CANBus
+    ' TD -> SW: MSG: Message
+    ' SW -> TD: MSG: Message
+
+    ' Internal to the application
+    ' XX -> YY: CMD: Command
+    ' XX -> XX: ACT: Action
+
+    ' External on OS/FS
+    ' SW -> Script: ACT: Command
+    ' Script -> OS: CMD: Command
+    ' Script -> SW: MSG: Message
+    ' OS -> Script: MSG: Message
+
+    ' US -> UI: User actions are:
+    '   ASK: Display a <message>
+    '   ENT: User enters a value or string
+    '   TCH: User touches a button (RadioButton, CheckBox, ...)
+    '   SCL: User scrolls a flip-able area
+
+    == Navigate to popup ==
+    US -> UI: TCH: Press Water Sample headerbar icon button
+    UI -> UI: ACT: Water Sample Popup is displayed
+
+    == Water Sample Tab ==
+    US -> UI: TCH: Select Water Sample tab
+    US -> UI: TCH: Select Water Sample result (Pass or Fail)
+    US -> UI: TCH: Press Confirm
+    UI -> SW: ACT: Send TD Water Sample Result
+    SW -> TD: MSG: [xXX: #1] Req \n TD Water Sample Result Request \
+                            \n\t(U32)  mResult       
+
+    == Dialsate Check Tab ==
+    US -> UI: TCH: Select Dialysate Check tab
+    UI -> US: ACT: Display Dialysate data \
+                \n\tAcid Concentrate \
+                \n\tBicarbonate Cartridge Size \
+                \n\tSodium\
+                \n\tBicarbonate \
+                \n\tTheoretical Conductivity \
+                \n\tindependant Conductivity Reading 1\
+                \n\tindependant Conductivity Reading 2\
+                \n\tDialysate Temperature \
+                \n\tActual RO Rejection Percentage
+@enduml