diff --git a/playground/nutech/issue2/issue2.bpmn b/playground/nutech/issue2/issue2.bpmn
index a648952f..774fd97d 100644
--- a/playground/nutech/issue2/issue2.bpmn
+++ b/playground/nutech/issue2/issue2.bpmn
@@ -34,12 +34,12 @@
       <bpmn:lane id="Lane_1eeohaa" name="TFC Clerks">
         <bpmn:flowNodeRef>Activity_1kn2ful</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_0ajy84j</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_1nwhy0b</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_05zuv56</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1mqgxo0</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:lane>
     </bpmn:laneSet>
     <bpmn:dataObject id="DataObject_0xeyry8" name="Data Object 0 Xeyry 8" />
@@ -171,7 +171,7 @@ Form Approved
       <bpmn:conditionExpression>documents_collected=='No'</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="Flow_0lw624a" sourceRef="Activity_186t2ny" targetRef="Activity_03exy9r" />
-    <bpmn:userTask id="Activity_03exy9r" name="Issuance of Store">
+    <bpmn:userTask id="Activity_03exy9r" name="Issue store from warehouse">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser># Following Issue Voucher has been approved by admin for following store:
 
@@ -209,10 +209,10 @@ Do you have the requested items at warehouse and provide approval for issuance o
     <bpmn:sequenceFlow id="Flow_064ne3o" name="Warehouse appved" sourceRef="Gateway_1jmse4m" targetRef="Activity_0yxcfxc">
       <bpmn:conditionExpression>warehouse_approval=='Yes'</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_1gw7b76" name="warehouse_approval==&#39;No&#39;" sourceRef="Gateway_1jmse4m" targetRef="Activity_0osvlbg">
+    <bpmn:sequenceFlow id="Flow_1gw7b76" name="Warehouse approval rejected" sourceRef="Gateway_1jmse4m" targetRef="Activity_0osvlbg">
       <bpmn:conditionExpression>warehouse_approval=='No'</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:userTask id="Activity_1kn2ful" name="Equipment Received">
+    <bpmn:userTask id="Activity_1kn2ful" name="Acknowledge receiving of store">
       <bpmn:extensionElements>
         <spiffworkflow:properties>
           <spiffworkflow:property name="formJsonSchemaFilename" value="tfcapproval-schema.json" />
@@ -231,28 +231,12 @@ Equipment Received at TFC Branch</spiffworkflow:instructionsForEndUser>
       <bpmn:outgoing>Flow_0k9cu0h</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:sequenceFlow id="Flow_0qxqgmh" sourceRef="Activity_1kn2ful" targetRef="Gateway_0ajy84j" />
-    <bpmn:sequenceFlow id="Flow_005y7kv" name="tfc_approval==&#39;Yes&#39;" sourceRef="Gateway_0ajy84j" targetRef="Activity_1nwhy0b">
+    <bpmn:sequenceFlow id="Flow_005y7kv" name="Equipment received" sourceRef="Gateway_0ajy84j" targetRef="Activity_1nwhy0b">
       <bpmn:conditionExpression>tfc_approval=='Yes'</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:manualTask id="Activity_1nwhy0b" name="TFC APPROVAL">
-      <bpmn:extensionElements>
-        <spiffworkflow:instructionsForEndUser># Equipment Received at TFC Branch
-
-Tfc Clerk has received the equipment</spiffworkflow:instructionsForEndUser>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_005y7kv</bpmn:incoming>
-      <bpmn:outgoing>Flow_06auu0l</bpmn:outgoing>
-    </bpmn:manualTask>
-    <bpmn:sequenceFlow id="Flow_0k9cu0h" name="tfc_approval==&#39;No&#39;" sourceRef="Gateway_0ajy84j" targetRef="Activity_05zuv56">
+    <bpmn:sequenceFlow id="Flow_0k9cu0h" name="Equipment not received" sourceRef="Gateway_0ajy84j" targetRef="Activity_05zuv56">
       <bpmn:conditionExpression>tfc_approval=='No'</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:manualTask id="Activity_05zuv56" name="TFC APPROVAL REJECTED">
-      <bpmn:extensionElements>
-        <spiffworkflow:instructionsForEndUser>Tfc Clerk didn't received the equipment</spiffworkflow:instructionsForEndUser>
-      </bpmn:extensionElements>
-      <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:
@@ -396,6 +380,22 @@ Equipment Received at SASD gate area:</spiffworkflow:instructionsForEndUser>
       <bpmn:incoming>Flow_1y0kqlw</bpmn:incoming>
       <bpmn:outgoing>Flow_0mp4j9v</bpmn:outgoing>
     </bpmn:task>
+    <bpmn:manualTask id="Activity_1nwhy0b" name="TFC APPROVAL">
+      <bpmn:extensionElements>
+        <spiffworkflow:instructionsForEndUser># Equipment Received at TFC Branch
+
+Tfc Clerk has received the equipment</spiffworkflow:instructionsForEndUser>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_005y7kv</bpmn:incoming>
+      <bpmn:outgoing>Flow_06auu0l</bpmn:outgoing>
+    </bpmn:manualTask>
+    <bpmn:manualTask id="Activity_05zuv56" name="TFC APPROVAL REJECTED">
+      <bpmn:extensionElements>
+        <spiffworkflow:instructionsForEndUser>Tfc Clerk didn't received the equipment</spiffworkflow:instructionsForEndUser>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_0k9cu0h</bpmn:incoming>
+      <bpmn:outgoing>Flow_1sumbv6</bpmn:outgoing>
+    </bpmn:manualTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_1i6olx2">
@@ -458,18 +458,11 @@ Equipment Received at SASD gate area:</spiffworkflow:instructionsForEndUser>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_15s2lm2_di" bpmnElement="Activity_1kn2ful">
         <dc:Bounds x="-120" y="750" width="100" height="80" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_0ajy84j_di" bpmnElement="Gateway_0ajy84j" isMarkerVisible="true">
         <dc:Bounds x="35" y="765" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1vnmvqs_di" bpmnElement="Activity_1nwhy0b">
-        <dc:Bounds x="140" y="750" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_171ryad_di" bpmnElement="Activity_05zuv56">
-        <dc:Bounds x="140" y="860" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_18e72qo_di" bpmnElement="Activity_1mqgxo0">
         <dc:Bounds x="300" y="750" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -518,6 +511,14 @@ Equipment Received at SASD gate area:</spiffworkflow:instructionsForEndUser>
         <dc:Bounds x="1780" y="70" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1vnmvqs_di" bpmnElement="Activity_1nwhy0b">
+        <dc:Bounds x="165" y="750" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_171ryad_di" bpmnElement="Activity_05zuv56">
+        <dc:Bounds x="165" y="860" 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" />
@@ -598,7 +599,7 @@ Equipment Received at SASD gate area:</spiffworkflow:instructionsForEndUser>
         <di:waypoint x="915" y="290" />
         <di:waypoint x="1180" y="290" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1066" y="256" width="88" height="27" />
+          <dc:Bounds x="1037" y="256" width="85" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0qxqgmh_di" bpmnElement="Flow_0qxqgmh">
@@ -607,17 +608,17 @@ Equipment Received at SASD gate area:</spiffworkflow:instructionsForEndUser>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_005y7kv_di" bpmnElement="Flow_005y7kv">
         <di:waypoint x="85" y="790" />
-        <di:waypoint x="140" y="790" />
+        <di:waypoint x="165" y="790" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="56" y="756" width="87" height="27" />
+          <dc:Bounds x="94" y="756" width="54" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0k9cu0h_di" bpmnElement="Flow_0k9cu0h">
         <di:waypoint x="60" y="815" />
         <di:waypoint x="60" y="900" />
-        <di:waypoint x="140" y="900" />
+        <di:waypoint x="165" y="900" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="32" y="855" width="88" height="27" />
+          <dc:Bounds x="74" y="866" width="72" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1tpokjt_di" bpmnElement="Flow_1tpokjt">
@@ -656,7 +657,7 @@ Equipment Received at SASD gate area:</spiffworkflow:instructionsForEndUser>
         <di:waypoint x="1920" y="192" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_06auu0l_di" bpmnElement="Flow_06auu0l">
-        <di:waypoint x="240" y="790" />
+        <di:waypoint x="265" y="790" />
         <di:waypoint x="300" y="790" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1pt52n0_di" bpmnElement="Flow_1pt52n0">
@@ -686,8 +687,8 @@ Equipment Received at SASD gate area:</spiffworkflow:instructionsForEndUser>
         <di:waypoint x="1920" y="228" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1sumbv6_di" bpmnElement="Flow_1sumbv6">
-        <di:waypoint x="190" y="940" />
-        <di:waypoint x="190" y="990" />
+        <di:waypoint x="215" y="940" />
+        <di:waypoint x="215" y="990" />
         <di:waypoint x="1960" y="990" />
         <di:waypoint x="1960" y="210" />
         <di:waypoint x="1938" y="210" />