diff --git a/playground/nutech/issue2/issue2.bpmn b/playground/nutech/issue2/issue2.bpmn
index dd0e3265..f6551b52 100644
--- a/playground/nutech/issue2/issue2.bpmn
+++ b/playground/nutech/issue2/issue2.bpmn
@@ -34,12 +34,13 @@
       <bpmn:lane id="Lane_1eeohaa" name="TFC Clerks">
         <bpmn:flowNodeRef>Activity_1kn2ful</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_0ajy84j</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Gateway_1cgucvr</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_0n2obgw</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_0to89e1</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1nwhy0b</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_05zuv56</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0to89e1</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0n2obgw</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Gateway_1cgucvr</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1mqgxo0</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0se56w2</bpmn:flowNodeRef>
       </bpmn:lane>
     </bpmn:laneSet>
     <bpmn:dataObject id="DataObject_0xeyry8" name="Data Object 0 Xeyry 8" />
@@ -194,35 +195,11 @@ Equipment Received at TFC Branch</spiffworkflow:instructionsForEndUser>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="Flow_1y0kqlw" name="Final Clearance at SASD Rejected" sourceRef="Gateway_1vvv40w" targetRef="Activity_18d5pg4" />
     <bpmn:sequenceFlow id="Flow_0mp4j9v" sourceRef="Activity_18d5pg4" targetRef="EndEvent_1" />
-    <bpmn:sequenceFlow id="Flow_06auu0l" sourceRef="Activity_1nwhy0b" targetRef="Activity_1mqgxo0" />
     <bpmn:sequenceFlow id="Flow_1pt52n0" sourceRef="Activity_1mqgxo0" targetRef="Gateway_1cgucvr" />
     <bpmn:sequenceFlow id="Flow_1u3obw5" name="Gatepass Collected" sourceRef="Gateway_1cgucvr" targetRef="Activity_0n2obgw">
       <bpmn:conditionExpression>gatepass_collected=='Yes'</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:exclusiveGateway id="Gateway_1cgucvr" default="Flow_06lpto6">
-      <bpmn:incoming>Flow_1pt52n0</bpmn:incoming>
-      <bpmn:outgoing>Flow_1u3obw5</bpmn:outgoing>
-      <bpmn:outgoing>Flow_06lpto6</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:manualTask id="Activity_0n2obgw" name="GATE PASS APPROVAL">
-      <bpmn:extensionElements>
-        <spiffworkflow:instructionsForEndUser># Gate Pass and Other Documents Collected
-
-Gate pass and all the relevant documents collected</spiffworkflow:instructionsForEndUser>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_1u3obw5</bpmn:incoming>
-      <bpmn:outgoing>Flow_0x72x2d</bpmn:outgoing>
-    </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_06lpto6" name="Gatepass not received" sourceRef="Gateway_1cgucvr" targetRef="Activity_0to89e1" />
-    <bpmn:manualTask id="Activity_0to89e1" name="GATE PASS APPROVAL REJECTED">
-      <bpmn:extensionElements>
-        <spiffworkflow:instructionsForEndUser># Gate pass approval rejected
-
-Clearance Documents not collected</spiffworkflow:instructionsForEndUser>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_06lpto6</bpmn:incoming>
-      <bpmn:outgoing>Flow_10libg4</bpmn:outgoing>
-    </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_0x72x2d" sourceRef="Activity_0n2obgw" targetRef="EndEvent_1" />
     <bpmn:sequenceFlow id="Flow_1sumbv6" sourceRef="Activity_05zuv56" targetRef="EndEvent_1" />
     <bpmn:sequenceFlow id="Flow_10libg4" sourceRef="Activity_0to89e1" targetRef="EndEvent_1" />
@@ -278,7 +255,7 @@ Equipment Received at SASD gate area:</spiffworkflow:instructionsForEndUser>
 Tfc Clerk has received the equipment</spiffworkflow:instructionsForEndUser>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_005y7kv</bpmn:incoming>
-      <bpmn:outgoing>Flow_06auu0l</bpmn:outgoing>
+      <bpmn:outgoing>Flow_0ndaka1</bpmn:outgoing>
     </bpmn:manualTask>
     <bpmn:manualTask id="Activity_05zuv56" name="TFC APPROVAL REJECTED">
       <bpmn:extensionElements>
@@ -287,20 +264,6 @@ Tfc Clerk has received the equipment</spiffworkflow:instructionsForEndUser>
       <bpmn:incoming>Flow_0k9cu0h</bpmn:incoming>
       <bpmn:outgoing>Flow_1sumbv6</bpmn:outgoing>
     </bpmn:manualTask>
-    <bpmn:userTask id="Activity_1mqgxo0" name="GATE PASS COLLECTION">
-      <bpmn:extensionElements>
-        <spiffworkflow:instructionsForEndUser>Following Documents Collected:
-
-- Clearance of E Arms
-- E ARMS Gate Pass</spiffworkflow:instructionsForEndUser>
-        <spiffworkflow:properties>
-          <spiffworkflow:property name="formJsonSchemaFilename" value="gatepasscollected-schema.json" />
-          <spiffworkflow:property name="formUiSchemaFilename" value="gatepasscollected-uischema.json" />
-        </spiffworkflow:properties>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_06auu0l</bpmn:incoming>
-      <bpmn:outgoing>Flow_1pt52n0</bpmn:outgoing>
-    </bpmn:userTask>
     <bpmn:endEvent id="EndEvent_1">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>The process instance completed successfully.</spiffworkflow:instructionsForEndUser>
@@ -388,6 +351,56 @@ Do you have the requested items at warehouse and provide approval for issuance o
       <bpmn:incoming>Flow_1gos2jc</bpmn:incoming>
       <bpmn:outgoing>Flow_07ykgig</bpmn:outgoing>
     </bpmn:manualTask>
+    <bpmn:manualTask id="Activity_0to89e1" name="GATE PASS APPROVAL REJECTED">
+      <bpmn:extensionElements>
+        <spiffworkflow:instructionsForEndUser># Gate pass approval rejected
+
+Clearance Documents not collected</spiffworkflow:instructionsForEndUser>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_06lpto6</bpmn:incoming>
+      <bpmn:outgoing>Flow_10libg4</bpmn:outgoing>
+    </bpmn:manualTask>
+    <bpmn:manualTask id="Activity_0n2obgw" name="GATE PASS APPROVAL">
+      <bpmn:extensionElements>
+        <spiffworkflow:instructionsForEndUser># Gate Pass and Other Documents Collected
+
+Gate pass and all the relevant documents collected</spiffworkflow:instructionsForEndUser>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_1u3obw5</bpmn:incoming>
+      <bpmn:outgoing>Flow_0x72x2d</bpmn:outgoing>
+    </bpmn:manualTask>
+    <bpmn:exclusiveGateway id="Gateway_1cgucvr" default="Flow_06lpto6">
+      <bpmn:incoming>Flow_1pt52n0</bpmn:incoming>
+      <bpmn:outgoing>Flow_1u3obw5</bpmn:outgoing>
+      <bpmn:outgoing>Flow_06lpto6</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:userTask id="Activity_1mqgxo0" name="GATE PASS COLLECTION">
+      <bpmn:extensionElements>
+        <spiffworkflow:instructionsForEndUser>Following Documents Collected:
+
+- Clearance of E Arms
+- E ARMS Gate Pass</spiffworkflow:instructionsForEndUser>
+        <spiffworkflow:properties>
+          <spiffworkflow:property name="formJsonSchemaFilename" value="gatepasscollected-schema.json" />
+          <spiffworkflow:property name="formUiSchemaFilename" value="gatepasscollected-uischema.json" />
+        </spiffworkflow:properties>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_1c7j9vm</bpmn:incoming>
+      <bpmn:outgoing>Flow_1pt52n0</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:sequenceFlow id="Flow_0ndaka1" sourceRef="Activity_1nwhy0b" targetRef="Activity_0se56w2" />
+    <bpmn:userTask id="Activity_0se56w2" name="Generate Gatepass">
+      <bpmn:extensionElements>
+        <spiffworkflow:properties>
+          <spiffworkflow:property name="formJsonSchemaFilename" value="gatepass-schema.json" />
+          <spiffworkflow:property name="formUiSchemaFilename" value="gatepass-uischema.json" />
+        </spiffworkflow:properties>
+        <spiffworkflow:instructionsForEndUser></spiffworkflow:instructionsForEndUser>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_0ndaka1</bpmn:incoming>
+      <bpmn:outgoing>Flow_1c7j9vm</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:sequenceFlow id="Flow_1c7j9vm" sourceRef="Activity_0se56w2" targetRef="Activity_1mqgxo0" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_1i6olx2">
@@ -450,17 +463,6 @@ Do you have the requested items at warehouse and provide approval for issuance o
       <bpmndi:BPMNShape id="Gateway_1vvv40w_di" bpmnElement="Gateway_1vvv40w" isMarkerVisible="true">
         <dc:Bounds x="1595" y="85" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_1cgucvr_di" bpmnElement="Gateway_1cgucvr" isMarkerVisible="true">
-        <dc:Bounds x="535" y="765" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_15mvxx4_di" bpmnElement="Activity_0n2obgw">
-        <dc:Bounds x="720" y="750" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1fxepkz_di" bpmnElement="Activity_0to89e1">
-        <dc:Bounds x="720" y="860" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="-138" y="129" width="36" height="36" />
       </bpmndi:BPMNShape>
@@ -485,10 +487,6 @@ Do you have the requested items at warehouse and provide approval for issuance o
         <dc:Bounds x="165" y="860" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_18e72qo_di" bpmnElement="Activity_1mqgxo0">
-        <dc:Bounds x="340" y="750" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1xmc6y2_di" bpmnElement="Activity_0negms2">
         <dc:Bounds x="1410" y="120" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -510,6 +508,25 @@ Do you have the requested items at warehouse and provide approval for issuance o
         <dc:Bounds x="700" y="180" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1fxepkz_di" bpmnElement="Activity_0to89e1">
+        <dc:Bounds x="960" y="870" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_15mvxx4_di" bpmnElement="Activity_0n2obgw">
+        <dc:Bounds x="960" y="750" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1cgucvr_di" bpmnElement="Gateway_1cgucvr" isMarkerVisible="true">
+        <dc:Bounds x="675" y="765" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_18e72qo_di" bpmnElement="Activity_1mqgxo0">
+        <dc:Bounds x="550" y="750" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1gv96xu_di" bpmnElement="Activity_0se56w2">
+        <dc:Bounds x="350" y="750" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_0o9u2ln_di" bpmnElement="Flow_0o9u2ln">
         <di:waypoint x="-102" y="147" />
         <di:waypoint x="-75" y="147" />
@@ -643,31 +660,27 @@ Do you have the requested items at warehouse and provide approval for issuance o
         <di:waypoint x="1920" y="110" />
         <di:waypoint x="1920" y="192" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_06auu0l_di" bpmnElement="Flow_06auu0l">
-        <di:waypoint x="265" y="790" />
-        <di:waypoint x="340" y="790" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1pt52n0_di" bpmnElement="Flow_1pt52n0">
-        <di:waypoint x="440" y="790" />
-        <di:waypoint x="535" y="790" />
+        <di:waypoint x="650" y="790" />
+        <di:waypoint x="675" y="790" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1u3obw5_di" bpmnElement="Flow_1u3obw5">
-        <di:waypoint x="585" y="790" />
-        <di:waypoint x="720" y="790" />
+        <di:waypoint x="725" y="790" />
+        <di:waypoint x="960" y="790" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="630" y="756" width="48" height="27" />
+          <dc:Bounds x="821" y="756" width="48" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_06lpto6_di" bpmnElement="Flow_06lpto6">
-        <di:waypoint x="560" y="815" />
-        <di:waypoint x="560" y="900" />
-        <di:waypoint x="720" y="900" />
+        <di:waypoint x="700" y="815" />
+        <di:waypoint x="700" y="910" />
+        <di:waypoint x="960" y="910" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="596" y="866" width="67" height="27" />
+          <dc:Bounds x="780" y="876" width="67" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0x72x2d_di" bpmnElement="Flow_0x72x2d">
-        <di:waypoint x="820" y="790" />
+        <di:waypoint x="1060" y="790" />
         <di:waypoint x="1361" y="790" />
         <di:waypoint x="1361" y="310" />
         <di:waypoint x="1920" y="310" />
@@ -681,8 +694,8 @@ Do you have the requested items at warehouse and provide approval for issuance o
         <di:waypoint x="1938" y="210" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_10libg4_di" bpmnElement="Flow_10libg4">
-        <di:waypoint x="820" y="900" />
-        <di:waypoint x="1480" y="900" />
+        <di:waypoint x="1060" y="910" />
+        <di:waypoint x="1480" y="910" />
         <di:waypoint x="1940" y="890" />
         <di:waypoint x="1930" y="225" />
       </bpmndi:BPMNEdge>
@@ -721,6 +734,14 @@ Do you have the requested items at warehouse and provide approval for issuance o
         <di:waypoint x="800" y="210" />
         <di:waypoint x="1902" y="210" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0ndaka1_di" bpmnElement="Flow_0ndaka1">
+        <di:waypoint x="265" y="790" />
+        <di:waypoint x="350" y="790" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1c7j9vm_di" bpmnElement="Flow_1c7j9vm">
+        <di:waypoint x="450" y="790" />
+        <di:waypoint x="550" y="790" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>