Index: SDDs/CreateRx.puml
===================================================================
diff -u -rfeb708952ab1311368560d025d1e241c68b5413c -ra7aab61ca63538c37b6931c60252680fc2ec2416
--- SDDs/CreateRx.puml	(.../CreateRx.puml)	(revision feb708952ab1311368560d025d1e241c68b5413c)
+++ SDDs/CreateRx.puml	(.../CreateRx.puml)	(revision a7aab61ca63538c37b6931c60252680fc2ec2416)
@@ -24,7 +24,7 @@
     '[x<hex message ID> <Req/Rsp/Dat>  \n  <P1>,X The rest of the parameters do not matter.]
 
     == Normal Bootup ==
-    TD -> SW: MSG: [x12: 3,1] \n OpMode - Standby Dat
+    TD -> SW: MSG: [x12: #3,1] \n OpMode - Standby Dat
     SW -> UI: CMD: MainHome Screen
     UI ->o Wait_Retry: ⟲: MainHome Screen
 
@@ -40,57 +40,34 @@
     == Create Rx - Detailed ==
     US -> UI: TCH: Create Treatment Button
     UI -> SW: ACT: Create Treatment
-    SW -> TD: MSG: [x45: 1] Req \n Initiate Treatment
+    SW -> TD: MSG: [x45: #1] Req \n Initiate Treatment
     alt Accepted: Initiate Treatment
-        TD -> SW: MSG: [x46: 1,X] Rsp \n Initiate Treatment
-        TD -> SW: MSG: [x12: 4,1] Dat \n OpMode - Parameters
+        TD -> SW: MSG: [x46: #1,X] Rsp \n Initiate Treatment
+        TD -> SW: MSG: [x12: #4,1] Dat \n OpMode - Parameters
         SW -> UI: CMD: Create Rx Screen
         UI ->o Wait_Retry: ⟲: Create Rx Screen
-        US -> UI: ENT: Patient ID Text
-        US -> UI: TCH: Touch each parameter to set value
-        alt Validate
-            US -> UI: TCH: Validate Button
-            UI -> SW: ACT: Prescription Parameters
-            SW -> TD: MSG: [x3F: #(all the Rx Params)] Req \n Prescription Parameters: Validation
-            alt Accepted
-                TD -> SW: MSG: [x40: 1,X] Rsp \n Prescription Parameters: Validation
-                SW -> UI: ACT: Notify UI: Parameters validation \n\t(Generate QR Code)
-                UI -> UI: ACT: Lock all editable fields\n\tShow QR Code\n\tShow Confirm Button
-                alt Confirm
-                    US -> UI: TCH: Confirm Button
-                    UI -> SW: ACT: Prescription Parameters Confimation
-                    SW -> TD: MSD: [x44: 1] Req \n Prescription Parameters Confimation
-                    alt Accepted
-                        TD -> SW: MSG: [x12: 4,1] Dat \n OpMode - Pre-Treatment
-                        SW -> UI: CMD: Pre-Treatment Stack
-                        UI -[#Green]>o Pre_Tx
-                    end
-                end
-            else #Pink
-                TD -> SW: MSG: [x40: 0,#RR] Rsp \n Prescription Parameters: Validation
-                SW -> UI: CMD: Highlight Rejected Parameters
-                UI ->o Wait_Retry: ⟲: Prescription Parameters Screen
-            end
-        end
-    else #Pink Rejected x46: Initiate Treatment
-        TD -> SW: MSG: [x46: 0,RR]
+
+        !include common_puml/CreateRxCommon.puml
+        else #Pink Rejected x46: Initiate Treatment
+        TD -> SW: MSG: [x46: #0,RR]
         SW -> UI: CMD: Rejection Reason (RR) Notification
         UI ->o Wait_Retry: ⟲: MainHome Screen
     end
     alt Back
         US -> UI: TCH: Back Button
         UI -> SW: ACT: Back
         alt Is Validated?
-            SW -> TD: MSG: [x44: 0] Req \n Prescription Parameters Confirmations: Back
+            SW -> TD: MSG: [x44: #0] Req \n Prescription Parameters Confirmations: Back
             SW -> UI: ACT: Set to not validated
             UI -> UI: ACT: Enable Fields
             UI ->o Wait_Retry: ⟲: Create Rx Screen
         else
             UI -> UI: ACT: Clear Create Rx Screen
-            SW -> TD: MSG: [x45: 0] Req \n Initiate Treatment Cancel
-            TD -> SW: MSG: [x12: 3,1] Dat \n OpMode - Standby
+            SW -> TD: MSG: [x45: #0] Req \n Initiate Treatment Cancel
+            TD -> SW: MSG: [x12: #3,1] Dat \n OpMode - Standby
             SW -> UI: CMD: MainHome Screen
             UI ->o Wait_Retry: ⟲: MainHome Screen
         end
     end
+    !include common_puml/CreateRxControls.puml
 @enduml