diff --git a/shared/enumerations/enumerations.bpmn b/shared/enumerations/enumerations.bpmn
index 937be132..0c8aff5e 100644
--- a/shared/enumerations/enumerations.bpmn
+++ b/shared/enumerations/enumerations.bpmn
@@ -5,7 +5,7 @@
       <bpmn:outgoing>Flow_0q0h9tc</bpmn:outgoing>
     </bpmn:startEvent>
     <bpmn:sequenceFlow id="Flow_0q0h9tc" sourceRef="StartEvent_1" targetRef="Call_Shared_Build_Enum_List_from_AWS" />
-    <bpmn:sequenceFlow id="Flow_0t80m1i" sourceRef="enumeration_user_task" targetRef="Activity_1pdtwik" />
+    <bpmn:sequenceFlow id="Flow_0t80m1i" sourceRef="enumeration_user_task" targetRef="Activity_1ifnmsg" />
     <bpmn:manualTask id="Activity_18npi29" name="Show Records">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>Enumerations:
@@ -71,18 +71,13 @@ for n in range(0, enumerations_items_list_cnt):
       <bpmn:outgoing>Flow_0t80m1i</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:scriptTask id="Activity_1ifnmsg" name="Set Subject" scriptFormat="python">
-      <bpmn:incoming>Flow_10v778k</bpmn:incoming>
+      <bpmn:incoming>Flow_0t80m1i</bpmn:incoming>
       <bpmn:outgoing>Flow_0322grc</bpmn:outgoing>
       <bpmn:script>if whichEnum == "add":
     addSubject = "Enumeration"</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="Flow_0d8570g" sourceRef="Activity_0bvdyir" targetRef="enumeration_user_task" />
     <bpmn:sequenceFlow id="Flow_0322grc" sourceRef="Activity_1ifnmsg" targetRef="Activity_1cl0n43" />
-    <bpmn:sequenceFlow id="Flow_10v778k" sourceRef="Activity_1pdtwik" targetRef="Activity_1ifnmsg" />
-    <bpmn:manualTask id="Activity_1pdtwik" name="Temp">
-      <bpmn:incoming>Flow_0t80m1i</bpmn:incoming>
-      <bpmn:outgoing>Flow_10v778k</bpmn:outgoing>
-    </bpmn:manualTask>
     <bpmn:serviceTask id="Activity_1ad6wc2" name="Get Enumeration List">
       <bpmn:extensionElements>
         <spiffworkflow:serviceTaskOperator id="aws/QueryDynamoTable">
@@ -106,13 +101,6 @@ for n in range(0, enumerations_items_list_cnt):
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="-278" y="159" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1cpupwx_di" bpmnElement="Activity_18npi29">
-        <dc:Bounds x="1190" y="137" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0k89mkq_di" bpmnElement="Activity_1cl0n43">
-        <dc:Bounds x="860" y="137" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1i2gua9_di" bpmnElement="Call_Shared_Build_Enum_List_from_AWS">
         <dc:Bounds x="-170" y="137" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -127,17 +115,21 @@ for n in range(0, enumerations_items_list_cnt):
       <bpmndi:BPMNShape id="Activity_10fjqyn_di" bpmnElement="enumeration_user_task">
         <dc:Bounds x="350" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1xmj9ir_di" bpmnElement="Activity_1ifnmsg">
-        <dc:Bounds x="690" y="137" width="100" height="80" />
+      <bpmndi:BPMNShape id="Activity_1cpupwx_di" bpmnElement="Activity_18npi29">
+        <dc:Bounds x="1020" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0vetp9n_di" bpmnElement="Activity_1pdtwik">
+      <bpmndi:BPMNShape id="Activity_0k89mkq_di" bpmnElement="Activity_1cl0n43">
+        <dc:Bounds x="690" y="137" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1xmj9ir_di" bpmnElement="Activity_1ifnmsg">
         <dc:Bounds x="520" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1oz9lvi_di" bpmnElement="Activity_1ad6wc2">
-        <dc:Bounds x="1020" y="137" width="100" height="80" />
+        <dc:Bounds x="850" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0d2gsze_di" bpmnElement="Event_0d2gsze">
-        <dc:Bounds x="1052" y="292" width="36" height="36" />
+        <dc:Bounds x="882" y="292" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_0q0h9tc_di" bpmnElement="Flow_0q0h9tc">
         <di:waypoint x="-242" y="177" />
@@ -148,8 +140,8 @@ for n in range(0, enumerations_items_list_cnt):
         <di:waypoint x="520" y="177" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1sjh867_di" bpmnElement="Flow_1sjh867">
-        <di:waypoint x="960" y="177" />
-        <di:waypoint x="1020" y="177" />
+        <di:waypoint x="790" y="177" />
+        <di:waypoint x="850" y="177" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1p5fxob_di" bpmnElement="Flow_1p5fxob">
         <di:waypoint x="-70" y="177" />
@@ -164,16 +156,12 @@ for n in range(0, enumerations_items_list_cnt):
         <di:waypoint x="350" y="177" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0322grc_di" bpmnElement="Flow_0322grc">
-        <di:waypoint x="790" y="177" />
-        <di:waypoint x="860" y="177" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_10v778k_di" bpmnElement="Flow_10v778k">
         <di:waypoint x="620" y="177" />
         <di:waypoint x="690" y="177" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1bvuyh3_di" bpmnElement="Flow_1bvuyh3">
-        <di:waypoint x="1070" y="217" />
-        <di:waypoint x="1070" y="292" />
+        <di:waypoint x="900" y="217" />
+        <di:waypoint x="900" y="292" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>