diff --git a/misc/waku-messages/message/waku-message.bpmn b/misc/waku-messages/message/waku-message.bpmn
index 3ce817de..29081bd8 100644
--- a/misc/waku-messages/message/waku-message.bpmn
+++ b/misc/waku-messages/message/waku-message.bpmn
@@ -72,83 +72,83 @@ waku_message = waku_message_body + waku_message_timestamp + waku_message_variabl
         <dc:Bounds x="32" y="162" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0vm75gb_di" bpmnElement="Activity_0xuhps4">
-        <dc:Bounds x="260" y="140" width="100" height="80" />
+        <dc:Bounds x="130" y="140" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1soux7h_di" bpmnElement="Activity_1pstq0l">
-        <dc:Bounds x="490" y="140" width="100" height="80" />
+        <dc:Bounds x="290" y="140" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_091bh2s_di" bpmnElement="Get_Waku_Messages_Message_Footer">
-        <dc:Bounds x="720" y="140" width="100" height="80" />
+        <dc:Bounds x="450" y="140" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0hgb9d6_di" bpmnElement="Event_0hgb9d6">
-        <dc:Bounds x="1942" y="156" width="36" height="36" />
+      <bpmndi:BPMNShape id="Activity_0vtbbbx_di" bpmnElement="Activity_18vg53t">
+        <dc:Bounds x="620" y="134" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_13tt0o4_di" bpmnElement="Activity_1114i9z">
+        <dc:Bounds x="780" y="134" width="100" height="80" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1h667no_di" bpmnElement="Activity_1ll59ee">
-        <dc:Bounds x="1520" y="134" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0vtbbbx_di" bpmnElement="Activity_18vg53t">
-        <dc:Bounds x="940" y="134" width="100" height="80" />
+        <dc:Bounds x="1060" y="134" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_0quuycl_di" bpmnElement="Gateway_0quuycl" isMarkerVisible="true">
-        <dc:Bounds x="1405" y="149" width="50" height="50" />
+        <dc:Bounds x="945" y="149" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1398" y="206" width="65" height="14" />
+          <dc:Bounds x="938" y="206" width="65" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_1szvllt_di" bpmnElement="Gateway_1szvllt" isMarkerVisible="true">
-        <dc:Bounds x="1745" y="149" width="50" height="50" />
+        <dc:Bounds x="1225" y="149" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_13tt0o4_di" bpmnElement="Activity_1114i9z">
-        <dc:Bounds x="1170" y="134" width="100" height="80" />
-        <bpmndi:BPMNLabel />
+      <bpmndi:BPMNShape id="Event_0hgb9d6_di" bpmnElement="Event_0hgb9d6">
+        <dc:Bounds x="1332" y="156" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_1b2tmcm_di" bpmnElement="Flow_1b2tmcm">
-        <di:waypoint x="1620" y="174" />
-        <di:waypoint x="1745" y="174" />
+        <di:waypoint x="1160" y="174" />
+        <di:waypoint x="1225" y="174" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0bn6hlv_di" bpmnElement="Flow_0bn6hlv">
-        <di:waypoint x="1040" y="174" />
-        <di:waypoint x="1170" y="174" />
+        <di:waypoint x="720" y="174" />
+        <di:waypoint x="780" y="174" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0frd453_di" bpmnElement="Flow_0frd453">
-        <di:waypoint x="1455" y="174" />
-        <di:waypoint x="1520" y="174" />
+        <di:waypoint x="995" y="174" />
+        <di:waypoint x="1060" y="174" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1lxrn9n_di" bpmnElement="Flow_1lxrn9n">
-        <di:waypoint x="1795" y="174" />
-        <di:waypoint x="1942" y="174" />
+        <di:waypoint x="1275" y="174" />
+        <di:waypoint x="1332" y="174" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1ypunfo_di" bpmnElement="Flow_1ypunfo">
-        <di:waypoint x="1430" y="149" />
-        <di:waypoint x="1430" y="100" />
-        <di:waypoint x="1770" y="100" />
-        <di:waypoint x="1770" y="149" />
+        <di:waypoint x="970" y="149" />
+        <di:waypoint x="970" y="100" />
+        <di:waypoint x="1250" y="100" />
+        <di:waypoint x="1250" y="149" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1618" y="82" width="15" height="14" />
+          <dc:Bounds x="1158" y="82" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0n2gvya_di" bpmnElement="Flow_0n2gvya">
-        <di:waypoint x="1270" y="174" />
-        <di:waypoint x="1405" y="174" />
+        <di:waypoint x="880" y="174" />
+        <di:waypoint x="945" y="174" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0056x0e_di" bpmnElement="Flow_0056x0e">
         <di:waypoint x="68" y="180" />
-        <di:waypoint x="260" y="180" />
+        <di:waypoint x="130" y="180" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0vmjtgx_di" bpmnElement="Flow_0vmjtgx">
-        <di:waypoint x="360" y="180" />
-        <di:waypoint x="490" y="180" />
+        <di:waypoint x="230" y="180" />
+        <di:waypoint x="290" y="180" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1503oql_di" bpmnElement="Flow_1503oql">
-        <di:waypoint x="590" y="180" />
-        <di:waypoint x="720" y="180" />
+        <di:waypoint x="390" y="180" />
+        <di:waypoint x="450" y="180" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0ynm0mf_di" bpmnElement="Flow_0ynm0mf">
-        <di:waypoint x="820" y="180" />
-        <di:waypoint x="940" y="180" />
+        <di:waypoint x="550" y="180" />
+        <di:waypoint x="620" y="180" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>