diff --git a/playground/nutech/issue2/issue2.bpmn b/playground/nutech/issue2/issue2.bpmn
index 91e467c2..67f5a67c 100644
--- a/playground/nutech/issue2/issue2.bpmn
+++ b/playground/nutech/issue2/issue2.bpmn
@@ -23,10 +23,10 @@
         <bpmn:flowNodeRef>EndEvent_1</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0negms2</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1utzug8</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_0yxcfxc</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_0tklkx0</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0c2yyfo</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_17h68ne</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0yxcfxc</bpmn:flowNodeRef>
       </bpmn:lane>
       <bpmn:lane id="Lane_1alvrf4" name="Warehouse Clerks">
         <bpmn:flowNodeRef>Activity_03exy9r</bpmn:flowNodeRef>
@@ -378,24 +378,6 @@ Do you have the requested items at warehouse and provide approval for issuance o
     <bpmn:sequenceFlow id="Flow_06at0di" sourceRef="Gateway_1jmse4m" targetRef="Activity_0j182oa">
       <bpmn:conditionExpression>warehouse_approval=='Yes'</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:userTask id="Activity_0yxcfxc" name="Receive equipment at SASD GATE">
-      <bpmn:extensionElements>
-        <spiffworkflow:instructionsForEndUser>Warehouse admin has approved the issuance of store; please approve the receipt of store at SASD Gate area
-
-Time value : timer_value_warehouse
-
-Equipment Received at SASD gate area:
-
-</spiffworkflow:instructionsForEndUser>
-        <spiffworkflow:properties>
-          <spiffworkflow:property name="formJsonSchemaFilename" value="sasdgatearea-schema.json" />
-          <spiffworkflow:property name="formUiSchemaFilename" value="sasdgatearea-uischema.json" />
-        </spiffworkflow:properties>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_05m8qta</bpmn:incoming>
-      <bpmn:outgoing>Flow_13s9x04</bpmn:outgoing>
-      <bpmn:outgoing>Flow_0qtj343</bpmn:outgoing>
-    </bpmn:userTask>
     <bpmn:userTask id="Activity_0j182oa" name="Select Timer Value">
       <bpmn:extensionElements>
         <spiffworkflow:properties>
@@ -405,10 +387,9 @@ Equipment Received at SASD gate area:
         <spiffworkflow:instructionsForEndUser>Select Timer Value</spiffworkflow:instructionsForEndUser>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_06at0di</bpmn:incoming>
-      <bpmn:outgoing>Flow_05m8qta</bpmn:outgoing>
+      <bpmn:outgoing>Flow_1dbc9a4</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:sequenceFlow id="Flow_1gale74" sourceRef="Event_0tklkx0" targetRef="Activity_0negms2" />
-    <bpmn:sequenceFlow id="Flow_05m8qta" sourceRef="Activity_0j182oa" targetRef="Activity_0yxcfxc" />
     <bpmn:intermediateCatchEvent id="Event_0tklkx0">
       <bpmn:incoming>Flow_17ia1t8</bpmn:incoming>
       <bpmn:outgoing>Flow_1gale74</bpmn:outgoing>
@@ -430,12 +411,31 @@ Store Clearance Report after final clearance at SASD Issue Area
       <bpmn:incoming>Flow_13s9x04</bpmn:incoming>
       <bpmn:outgoing>Flow_1bfe8mn</bpmn:outgoing>
     </bpmn:userTask>
-    <bpmn:sequenceFlow id="Flow_0qtj343" sourceRef="Activity_0yxcfxc" targetRef="Gateway_17h68ne" />
+    <bpmn:sequenceFlow id="Flow_17ia1t8" sourceRef="Gateway_17h68ne" targetRef="Event_0tklkx0" />
+    <bpmn:sequenceFlow id="Flow_1dbc9a4" sourceRef="Activity_0j182oa" targetRef="Gateway_17h68ne" />
     <bpmn:parallelGateway id="Gateway_17h68ne">
-      <bpmn:incoming>Flow_0qtj343</bpmn:incoming>
+      <bpmn:incoming>Flow_1dbc9a4</bpmn:incoming>
+      <bpmn:incoming>Flow_0wqhf2i</bpmn:incoming>
       <bpmn:outgoing>Flow_17ia1t8</bpmn:outgoing>
     </bpmn:parallelGateway>
-    <bpmn:sequenceFlow id="Flow_17ia1t8" sourceRef="Gateway_17h68ne" targetRef="Event_0tklkx0" />
+    <bpmn:sequenceFlow id="Flow_0wqhf2i" sourceRef="Activity_0yxcfxc" targetRef="Gateway_17h68ne" />
+    <bpmn:userTask id="Activity_0yxcfxc" name="Receive equipment at SASD GATE">
+      <bpmn:extensionElements>
+        <spiffworkflow:instructionsForEndUser>Warehouse admin has approved the issuance of store; please approve the receipt of store at SASD Gate area
+
+Time value : timer_value_warehouse
+
+Equipment Received at SASD gate area:
+
+</spiffworkflow:instructionsForEndUser>
+        <spiffworkflow:properties>
+          <spiffworkflow:property name="formJsonSchemaFilename" value="sasdgatearea-schema.json" />
+          <spiffworkflow:property name="formUiSchemaFilename" value="sasdgatearea-uischema.json" />
+        </spiffworkflow:properties>
+      </bpmn:extensionElements>
+      <bpmn:outgoing>Flow_13s9x04</bpmn:outgoing>
+      <bpmn:outgoing>Flow_0wqhf2i</bpmn:outgoing>
+    </bpmn:userTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_1i6olx2">
@@ -557,10 +557,6 @@ Store Clearance Report after final clearance at SASD Issue Area
       <bpmndi:BPMNShape id="Gateway_1jmse4m_di" bpmnElement="Gateway_1jmse4m" isMarkerVisible="true">
         <dc:Bounds x="875" y="615" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1f7ozev_di" bpmnElement="Activity_0yxcfxc">
-        <dc:Bounds x="1000" y="50" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_11tg22b_di" bpmnElement="Activity_0j182oa">
         <dc:Bounds x="850" y="500" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -573,7 +569,11 @@ Store Clearance Report after final clearance at SASD Issue Area
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_1cfzhsl_di" bpmnElement="Gateway_17h68ne">
-        <dc:Bounds x="1025" y="155" width="50" height="50" />
+        <dc:Bounds x="975" y="165" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1f7ozev_di" bpmnElement="Activity_0yxcfxc">
+        <dc:Bounds x="950" y="40" width="100" height="80" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_0o9u2ln_di" bpmnElement="Flow_0o9u2ln">
         <di:waypoint x="-102" y="147" />
@@ -741,8 +741,9 @@ Store Clearance Report after final clearance at SASD Issue Area
         <di:waypoint x="1930" y="225" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_13s9x04_di" bpmnElement="Flow_13s9x04">
-        <di:waypoint x="1050" y="50" />
-        <di:waypoint x="1050" y="30" />
+        <di:waypoint x="1050" y="80" />
+        <di:waypoint x="1225" y="80" />
+        <di:waypoint x="1225" y="30" />
         <di:waypoint x="1390" y="30" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_043xuzm_di" bpmnElement="Flow_043xuzm">
@@ -781,22 +782,19 @@ Store Clearance Report after final clearance at SASD Issue Area
         <di:waypoint x="1294" y="180" />
         <di:waypoint x="1410" y="180" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_05m8qta_di" bpmnElement="Flow_05m8qta">
-        <di:waypoint x="900" y="500" />
-        <di:waypoint x="900" y="90" />
-        <di:waypoint x="1000" y="90" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0qtj343_di" bpmnElement="Flow_0qtj343">
-        <di:waypoint x="1050" y="130" />
-        <di:waypoint x="1050" y="155" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_17ia1t8_di" bpmnElement="Flow_17ia1t8">
-        <di:waypoint x="1050" y="205" />
-        <di:waypoint x="1050" y="230" />
-        <di:waypoint x="1094" y="230" />
-        <di:waypoint x="1094" y="200" />
+        <di:waypoint x="1015" y="200" />
         <di:waypoint x="1112" y="200" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1dbc9a4_di" bpmnElement="Flow_1dbc9a4">
+        <di:waypoint x="950" y="540" />
+        <di:waypoint x="1000" y="540" />
+        <di:waypoint x="1000" y="215" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0wqhf2i_di" bpmnElement="Flow_0wqhf2i">
+        <di:waypoint x="1000" y="120" />
+        <di:waypoint x="1000" y="165" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>