diff --git a/category_number_one/message-send/message_send.bpmn b/category_number_one/message-send/message_send.bpmn
index e21c24cf..8f8b6fd7 100644
--- a/category_number_one/message-send/message_send.bpmn
+++ b/category_number_one/message-send/message_send.bpmn
@@ -4,7 +4,7 @@
     <bpmn:participant id="message_initiator" name="Message Initiator" processRef="message_send_process" />
     <bpmn:participant id="message_receiver" name="Message Receiver" processRef="message_receiver_process" />
     <bpmn:messageFlow id="message_send_flow" name="Message Send Flow" sourceRef="send_message" targetRef="receive_message" />
-    <bpmn:messageFlow id="Flow_0lpwabe" sourceRef="respond_to_message" targetRef="receive_message_response" />
+    <bpmn:messageFlow id="message_response_flow" name="Message Response Flow" sourceRef="respond_to_message" targetRef="receive_message_response" />
     <bpmn:correlationKey name="message_correlation_key">
       <bpmn:correlationPropertyRef>message_correlation_property</bpmn:correlationPropertyRef>
     </bpmn:correlationKey>
@@ -21,37 +21,30 @@
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>Flow_176e02g</bpmn:outgoing>
     </bpmn:startEvent>
-    <bpmn:endEvent id="Event_0kndoyu">
-      <bpmn:incoming>Flow_1qgz6p0</bpmn:incoming>
-    </bpmn:endEvent>
     <bpmn:sequenceFlow id="Flow_037vpjk" sourceRef="send_message" targetRef="receive_message_response" />
     <bpmn:sequenceFlow id="Flow_1qgz6p0" sourceRef="receive_message_response" targetRef="Event_0kndoyu" />
+    <bpmn:sequenceFlow id="Flow_176e02g" sourceRef="StartEvent_1" targetRef="send_message" />
+    <bpmn:sendTask id="send_message" name="Send Message" messageRef="message_send">
+      <bpmn:incoming>Flow_176e02g</bpmn:incoming>
+      <bpmn:outgoing>Flow_037vpjk</bpmn:outgoing>
+    </bpmn:sendTask>
     <bpmn:intermediateCatchEvent id="receive_message_response" name="Receive Message Response">
       <bpmn:incoming>Flow_037vpjk</bpmn:incoming>
       <bpmn:outgoing>Flow_1qgz6p0</bpmn:outgoing>
       <bpmn:messageEventDefinition id="MessageEventDefinition_1l3n0zr" messageRef="message_response" />
     </bpmn:intermediateCatchEvent>
-    <bpmn:sequenceFlow id="Flow_176e02g" sourceRef="StartEvent_1" targetRef="set_data" />
-    <bpmn:sendTask id="send_message" name="Send Message" messageRef="message_send">
-      <bpmn:incoming>Flow_17ma9s0</bpmn:incoming>
-      <bpmn:outgoing>Flow_037vpjk</bpmn:outgoing>
-    </bpmn:sendTask>
-    <bpmn:sequenceFlow id="Flow_17ma9s0" sourceRef="set_data" targetRef="send_message" />
-    <bpmn:scriptTask id="set_data" name="set_data">
-      <bpmn:incoming>Flow_176e02g</bpmn:incoming>
-      <bpmn:outgoing>Flow_17ma9s0</bpmn:outgoing>
-      <bpmn:script>to = "the_recipient"</bpmn:script>
-    </bpmn:scriptTask>
+    <bpmn:endEvent id="Event_0kndoyu">
+      <bpmn:incoming>Flow_1qgz6p0</bpmn:incoming>
+    </bpmn:endEvent>
   </bpmn:process>
   <bpmn:message id="message_send" name="Message Send">
     <bpmn:extensionElements>
-      <spiffworkflow:messagePayload>{"to": "the_recipient" }</spiffworkflow:messagePayload>
+      <spiffworkflow:messagePayload>{"to": "the_recipient1" }</spiffworkflow:messagePayload>
     </bpmn:extensionElements>
   </bpmn:message>
   <bpmn:message id="message_response" name="Message Response">
     <bpmn:extensionElements>
       <spiffworkflow:messagePayload>{"from": {"name": "the_sender"}}</spiffworkflow:messagePayload>
-      <spiffworkflow:preScript>b = 2</spiffworkflow:preScript>
     </bpmn:extensionElements>
   </bpmn:message>
   <bpmn:process id="message_receiver_process" name="Message Receiver Process">
@@ -75,41 +68,33 @@
         <dc:Bounds x="120" y="52" width="600" height="250" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Flow_17ma9s0_di" bpmnElement="Flow_17ma9s0">
-        <di:waypoint x="340" y="177" />
-        <di:waypoint x="380" y="177" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_176e02g_di" bpmnElement="Flow_176e02g">
         <di:waypoint x="215" y="177" />
-        <di:waypoint x="240" y="177" />
+        <di:waypoint x="280" y="177" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1qgz6p0_di" bpmnElement="Flow_1qgz6p0">
-        <di:waypoint x="538" y="177" />
-        <di:waypoint x="592" y="177" />
+        <di:waypoint x="478" y="177" />
+        <di:waypoint x="552" y="177" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_037vpjk_di" bpmnElement="Flow_037vpjk">
-        <di:waypoint x="480" y="177" />
-        <di:waypoint x="502" y="177" />
+        <di:waypoint x="380" y="177" />
+        <di:waypoint x="442" y="177" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="179" y="159" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0kndoyu_di" bpmnElement="Event_0kndoyu">
-        <dc:Bounds x="592" y="159" width="36" height="36" />
+      <bpmndi:BPMNShape id="Activity_0vm33bu_di" bpmnElement="send_message">
+        <dc:Bounds x="280" y="137" width="100" height="80" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0yt48xb_di" bpmnElement="receive_message_response">
-        <dc:Bounds x="502" y="159" width="36" height="36" />
+        <dc:Bounds x="442" y="159" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="477" y="129" width="88" height="27" />
+          <dc:Bounds x="417" y="129" width="88" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0vm33bu_di" bpmnElement="send_message">
-        <dc:Bounds x="380" y="137" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0ekk5bf_di" bpmnElement="set_data">
-        <dc:Bounds x="240" y="137" width="100" height="80" />
-        <bpmndi:BPMNLabel />
+      <bpmndi:BPMNShape id="Event_0kndoyu_di" bpmnElement="Event_0kndoyu">
+        <dc:Bounds x="552" y="159" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Participant_0mr0gg1_di" bpmnElement="message_receiver" isHorizontal="true">
         <dc:Bounds x="120" y="350" width="600" height="250" />
@@ -136,19 +121,20 @@
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_1ueajoz_di" bpmnElement="message_send_flow">
-        <di:waypoint x="400" y="217" />
-        <di:waypoint x="400" y="340" />
+        <di:waypoint x="300" y="217" />
+        <di:waypoint x="300" y="340" />
         <di:waypoint x="230" y="340" />
         <di:waypoint x="230" y="462" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="403" y="315" width="74" height="27" />
+          <dc:Bounds x="303" y="315" width="74" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0lpwabe_di" bpmnElement="Flow_0lpwabe">
+      <bpmndi:BPMNEdge id="Flow_0lpwabe_di" bpmnElement="message_response_flow">
         <di:waypoint x="450" y="450" />
-        <di:waypoint x="450" y="318" />
-        <di:waypoint x="520" y="318" />
-        <di:waypoint x="520" y="195" />
+        <di:waypoint x="450" y="192" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="452" y="315" width="76" height="27" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>