diff --git a/playground/nutech/receipt/receipt.bpmn b/playground/nutech/receipt/receipt.bpmn
index a4a0c446..ee76665a 100644
--- a/playground/nutech/receipt/receipt.bpmn
+++ b/playground/nutech/receipt/receipt.bpmn
@@ -33,9 +33,9 @@
       <bpmn:lane id="Lane_0o6xffv" name="Warehouse Clerks">
         <bpmn:flowNodeRef>Activity_0o7ln9u</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_1gbhsvz</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_0azoas6</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_09yxu7e</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_1whqnwg</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_09yxu7e</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0azoas6</bpmn:flowNodeRef>
       </bpmn:lane>
     </bpmn:laneSet>
     <bpmn:startEvent id="Event_1v4k3r9">
@@ -256,25 +256,6 @@ Did you receive requipment at S10 Warehouse?</spiffworkflow:instructionsForEndUs
       <bpmn:outgoing>Flow_1qnjxvj</bpmn:outgoing>
       <bpmn:outgoing>Flow_0j8vgi6</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:manualTask id="Activity_0azoas6" name="Equipment received at S10 Warehouse">
-      <bpmn:extensionElements>
-        <spiffworkflow:instructionsForEndUser># Equipment Arrived at S10 Warehouse
-
-Equipment has succesfully arrived at warehouse</spiffworkflow:instructionsForEndUser>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_1qnjxvj</bpmn:incoming>
-      <bpmn:outgoing>Flow_0vlp9uc</bpmn:outgoing>
-    </bpmn:manualTask>
-    <bpmn:manualTask id="Activity_09yxu7e" name="Equipment Delayed">
-      <bpmn:extensionElements>
-        <spiffworkflow:instructionsForEndUser># Equipment Delayed
-
-Equipment didn't arrive at S10 Warehouse</spiffworkflow:instructionsForEndUser>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_1qb0af3</bpmn:incoming>
-      <bpmn:incoming>Flow_0j8vgi6</bpmn:incoming>
-      <bpmn:outgoing>Flow_0se62kv</bpmn:outgoing>
-    </bpmn:manualTask>
     <bpmn:boundaryEvent id="Event_1whqnwg" attachedToRef="Activity_0o7ln9u">
       <bpmn:outgoing>Flow_1qb0af3</bpmn:outgoing>
       <bpmn:timerEventDefinition id="TimerEventDefinition_026o4gu">
@@ -336,6 +317,25 @@ Equipment not received at SASD area</spiffworkflow:instructionsForEndUser>
       </bpmn:timerEventDefinition>
     </bpmn:boundaryEvent>
     <bpmn:sequenceFlow id="Flow_0942yq0" sourceRef="Event_1ny63g6" targetRef="Activity_1hq9hvm" />
+    <bpmn:manualTask id="Activity_09yxu7e" name="Equipment Delayed">
+      <bpmn:extensionElements>
+        <spiffworkflow:instructionsForEndUser># Equipment Delayed
+
+Equipment didn't arrive at S10 Warehouse</spiffworkflow:instructionsForEndUser>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_1qb0af3</bpmn:incoming>
+      <bpmn:incoming>Flow_0j8vgi6</bpmn:incoming>
+      <bpmn:outgoing>Flow_0se62kv</bpmn:outgoing>
+    </bpmn:manualTask>
+    <bpmn:manualTask id="Activity_0azoas6" name="Equipment received at S10 Warehouse">
+      <bpmn:extensionElements>
+        <spiffworkflow:instructionsForEndUser># Equipment Arrived at S10 Warehouse
+
+Equipment has succesfully arrived at warehouse</spiffworkflow:instructionsForEndUser>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_1qnjxvj</bpmn:incoming>
+      <bpmn:outgoing>Flow_0vlp9uc</bpmn:outgoing>
+    </bpmn:manualTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_1oy6pez">
@@ -425,17 +425,17 @@ Equipment not received at SASD area</spiffworkflow:instructionsForEndUser>
       <bpmndi:BPMNShape id="Gateway_1gbhsvz_di" bpmnElement="Gateway_1gbhsvz" isMarkerVisible="true">
         <dc:Bounds x="1539" y="1000" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1mamrmc_di" bpmnElement="Activity_0azoas6">
-        <dc:Bounds x="1674" y="985" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_01p9pgu_di" bpmnElement="Activity_09yxu7e">
-        <dc:Bounds x="1674" y="1115" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1kfdqf4_di" bpmnElement="Activity_1hq9hvm">
         <dc:Bounds x="1700" y="835" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_01p9pgu_di" bpmnElement="Activity_09yxu7e">
+        <dc:Bounds x="1674" y="1140" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1mamrmc_di" bpmnElement="Activity_0azoas6">
+        <dc:Bounds x="1754" y="985" width="100" height="80" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_119urh3_di" bpmnElement="Event_1whqnwg">
         <dc:Bounds x="1416" y="1137" width="36" height="36" />
       </bpmndi:BPMNShape>
@@ -500,14 +500,14 @@ Equipment not received at SASD area</spiffworkflow:instructionsForEndUser>
         <di:waypoint x="2562" y="400" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0vlp9uc_di" bpmnElement="Flow_0vlp9uc">
-        <di:waypoint x="1774" y="1025" />
+        <di:waypoint x="1854" y="1025" />
         <di:waypoint x="2584" y="1025" />
         <di:waypoint x="2584" y="445" />
         <di:waypoint x="2556" y="413" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0se62kv_di" bpmnElement="Flow_0se62kv">
-        <di:waypoint x="1774" y="1155" />
-        <di:waypoint x="2494" y="1155" />
+        <di:waypoint x="1774" y="1180" />
+        <di:waypoint x="2494" y="1180" />
         <di:waypoint x="2494" y="400" />
         <di:waypoint x="2526" y="400" />
       </bpmndi:BPMNEdge>
@@ -552,20 +552,20 @@ Equipment not received at SASD area</spiffworkflow:instructionsForEndUser>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1qnjxvj_di" bpmnElement="Flow_1qnjxvj">
         <di:waypoint x="1589" y="1025" />
-        <di:waypoint x="1674" y="1025" />
+        <di:waypoint x="1754" y="1025" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1601" y="993" width="63" height="14" />
+          <dc:Bounds x="1644" y="993" width="63" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0j8vgi6_di" bpmnElement="Flow_0j8vgi6">
         <di:waypoint x="1564" y="1050" />
-        <di:waypoint x="1564" y="1155" />
-        <di:waypoint x="1674" y="1155" />
+        <di:waypoint x="1564" y="1180" />
+        <di:waypoint x="1674" y="1180" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1qb0af3_di" bpmnElement="Flow_1qb0af3">
         <di:waypoint x="1434" y="1173" />
-        <di:waypoint x="1434" y="1185" />
-        <di:waypoint x="1674" y="1185" />
+        <di:waypoint x="1434" y="1210" />
+        <di:waypoint x="1674" y="1210" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0rvrpzq_di" bpmnElement="Flow_0rvrpzq">
         <di:waypoint x="2154" y="360" />