diff --git a/waku-messages/message/waku-message.bpmn b/waku-messages/message/waku-message.bpmn
index 5dbe5e91..f507926b 100644
--- a/waku-messages/message/waku-message.bpmn
+++ b/waku-messages/message/waku-message.bpmn
@@ -8,23 +8,28 @@
       <bpmn:extensionElements>
         <spiffworkflow:calledDecisionId>Waku_Messages_Message_Body</spiffworkflow:calledDecisionId>
       </bpmn:extensionElements>
+      <bpmn:incoming>Flow_0056x0e</bpmn:incoming>
+      <bpmn:outgoing>Flow_0vmjtgx</bpmn:outgoing>
     </bpmn:businessRuleTask>
     <bpmn:businessRuleTask id="Activity_1pstq0l" name="Get Waku Message: Message Variables">
       <bpmn:extensionElements>
         <spiffworkflow:calledDecisionId>Waku_Messages_Message_Variables</spiffworkflow:calledDecisionId>
       </bpmn:extensionElements>
+      <bpmn:incoming>Flow_0vmjtgx</bpmn:incoming>
+      <bpmn:outgoing>Flow_1503oql</bpmn:outgoing>
     </bpmn:businessRuleTask>
     <bpmn:businessRuleTask id="Get_Waku_Messages_Message_Footer" name="Get Waku Messages: Message Footer">
       <bpmn:extensionElements>
         <spiffworkflow:calledDecisionId>Waku_Messages_Message_Footer</spiffworkflow:calledDecisionId>
       </bpmn:extensionElements>
+      <bpmn:incoming>Flow_1503oql</bpmn:incoming>
+      <bpmn:outgoing>Flow_0ynm0mf</bpmn:outgoing>
     </bpmn:businessRuleTask>
     <bpmn:endEvent id="Event_0hgb9d6">
       <bpmn:incoming>Flow_1lxrn9n</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:callActivity id="Call_Waku_Messages_Message_Footer" name="Call Waku Messages: Message Footer" calledElement="Waku_Messages_Message_Footer">
       <bpmn:incoming>Flow_0xlyajo</bpmn:incoming>
-      <bpmn:outgoing>Flow_0qmz4gn</bpmn:outgoing>
     </bpmn:callActivity>
     <bpmn:sequenceFlow id="Flow_1b2tmcm" sourceRef="Activity_1ll59ee" targetRef="Gateway_1szvllt" />
     <bpmn:scriptTask id="Activity_1ll59ee" name="Set Message" scriptFormat="python">
@@ -34,12 +39,11 @@
 waku_message = waku_message_body + waku_message_timestamp + waku_message_variables  + waku_message_footer</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:callActivity id="Call_Waku_Messages_Message_Body" name="Call Waku Messages: Message Body" calledElement="Waku_Messages_Message_Body">
-      <bpmn:incoming>Flow_0056x0e</bpmn:incoming>
       <bpmn:outgoing>Flow_1wmyiao</bpmn:outgoing>
     </bpmn:callActivity>
     <bpmn:sequenceFlow id="Flow_0bn6hlv" sourceRef="Activity_18vg53t" targetRef="Activity_1114i9z" />
     <bpmn:callActivity id="Activity_18vg53t" name="Call Shared: Local Date Time" calledElement="Shared_Local_Date_Time">
-      <bpmn:incoming>Flow_0qmz4gn</bpmn:incoming>
+      <bpmn:incoming>Flow_0ynm0mf</bpmn:incoming>
       <bpmn:outgoing>Flow_0bn6hlv</bpmn:outgoing>
     </bpmn:callActivity>
     <bpmn:exclusiveGateway id="Gateway_0quuycl" name="Set Message" default="Flow_0frd453">
@@ -68,9 +72,11 @@ waku_message = waku_message_body + waku_message_timestamp + waku_message_variabl
       <bpmn:outgoing>Flow_0n2gvya</bpmn:outgoing>
       <bpmn:script>waku_message_timestamp = "\n- - - - - - - - - - - - - - - - - - - - - - -" + "\nSent: " + local_date_str + " @ " + local_time_str + "\n- - - - - - - - - - - - - - - - - - - - - - -"</bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:sequenceFlow id="Flow_0056x0e" sourceRef="StartEvent_1" targetRef="Call_Waku_Messages_Message_Body" />
+    <bpmn:sequenceFlow id="Flow_0056x0e" sourceRef="StartEvent_1" targetRef="Activity_0xuhps4" />
     <bpmn:sequenceFlow id="Flow_1wmyiao" sourceRef="Call_Waku_Messages_Message_Body" targetRef="Call_Waku_Messages_Message_Variables" />
-    <bpmn:sequenceFlow id="Flow_0qmz4gn" sourceRef="Call_Waku_Messages_Message_Footer" targetRef="Activity_18vg53t" />
+    <bpmn:sequenceFlow id="Flow_0vmjtgx" sourceRef="Activity_0xuhps4" targetRef="Activity_1pstq0l" />
+    <bpmn:sequenceFlow id="Flow_1503oql" sourceRef="Activity_1pstq0l" targetRef="Get_Waku_Messages_Message_Footer" />
+    <bpmn:sequenceFlow id="Flow_0ynm0mf" sourceRef="Get_Waku_Messages_Message_Footer" targetRef="Activity_18vg53t" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Waku_Messages_Message">
@@ -158,9 +164,7 @@ waku_message = waku_message_body + waku_message_timestamp + waku_message_variabl
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0056x0e_di" bpmnElement="Flow_0056x0e">
         <di:waypoint x="188" y="310" />
-        <di:waypoint x="229" y="310" />
-        <di:waypoint x="229" y="174" />
-        <di:waypoint x="270" y="174" />
+        <di:waypoint x="270" y="310" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1wmyiao_di" bpmnElement="Flow_1wmyiao">
         <di:waypoint x="370" y="174" />
@@ -168,9 +172,17 @@ waku_message = waku_message_body + waku_message_timestamp + waku_message_variabl
         <di:waypoint x="400" y="180" />
         <di:waypoint x="430" y="180" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0qmz4gn_di" bpmnElement="Flow_0qmz4gn">
-        <di:waypoint x="690" y="174" />
-        <di:waypoint x="720" y="174" />
+      <bpmndi:BPMNEdge id="Flow_0vmjtgx_di" bpmnElement="Flow_0vmjtgx">
+        <di:waypoint x="370" y="310" />
+        <di:waypoint x="430" y="310" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1503oql_di" bpmnElement="Flow_1503oql">
+        <di:waypoint x="530" y="310" />
+        <di:waypoint x="590" y="310" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0ynm0mf_di" bpmnElement="Flow_0ynm0mf">
+        <di:waypoint x="690" y="310" />
+        <di:waypoint x="720" y="310" />
         <di:waypoint x="720" y="180" />
         <di:waypoint x="750" y="180" />
       </bpmndi:BPMNEdge>