diff --git a/docs/source/index.rst b/docs/source/index.rst
index 5c2ebf2..296d42f 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -247,43 +247,45 @@
 .. code:: json
 
    {
-  "id": "BBSM00000003-1",
-  "nasPortId": "BBSM00000003-1",
-  "circuitId": "BBSM00000003-1",
-  "remoteId": "BBSM00000003-1",
-  "uniTagList": [
-    {
-      "DownstreamBandwidthProfile": "User_Bandwidth1",
-      "IsDhcpRequired": true,
-      "IsIgmpRequired": true,
-      "PonCTag": 903,
-      "PonSTag": 900,
-      "TechnologyProfileID": 64,
-      "UpstreamBandwidthProfile": "Default"
-    }
-  ]
-}
+     "id": "BBSM00000003-1",
+     "nasPortId": "BBSM00000003-1",
+     "circuitId": "BBSM00000003-1",
+     "remoteId": "BBSM00000003-1",
+     "uniTagList": [
+       {
+         "DownstreamBandwidthProfile": "User_Bandwidth1",
+         "IsDhcpRequired": true,
+         "IsIgmpRequired": true,
+         "PonCTag": 903,
+         "PonSTag": 900,
+         "TechnologyProfileID": 64,
+         "UpstreamBandwidthProfile": "Default"
+       }
+     ]
+   }
+
 
 **DT**
 
 .. code:: json
 
    {
-  "id": "BBSM00000003-1",
-  "nasPortId": "BBSM00000003-1",
-  "circuitId": "BBSM00000003-1",
-  "remoteId": "BBSM00000003-1",
-  "uniTagList": [
-    {
-      "DownstreamBandwidthProfile": "User_Bandwidth1",
-      "PonCTag": 4096,
-      "PonSTag": 903,
-      "TechnologyProfileID": 64,
-      "UniTagMatch": 4096,
-      "UpstreamBandwidthProfile": "Default"
-    }
-  ]
-}
+     "id": "BBSM00000003-1",
+     "nasPortId": "BBSM00000003-1",
+     "circuitId": "BBSM00000003-1",
+     "remoteId": "BBSM00000003-1",
+     "uniTagList": [
+       {
+         "DownstreamBandwidthProfile": "User_Bandwidth1",
+         "PonCTag": 4096,
+         "PonSTag": 903,
+         "TechnologyProfileID": 64,
+         "UniTagMatch": 4096,
+         "UpstreamBandwidthProfile": "Default"
+       }
+     ]
+   }
+
 
 **TT**
 
diff --git a/docs/source/onu-state-machine.rst b/docs/source/onu-state-machine.rst
index 7117e57..a7adb9e 100644
--- a/docs/source/onu-state-machine.rst
+++ b/docs/source/onu-state-machine.rst
@@ -32,18 +32,10 @@
       - discovered, disabled, pon_disabled
       - enabled
       -
-    * - receive_eapol_flow
-      - enabled, gem_port_added
-      - eapol_flow_received
-      -
-    * - add_gem_port
-      - enabled, eapol_flow_received
-      - gem_port_added
-      - We need to wait for both the flow and the gem port to come before moving to ``auth_started``
     * - start_auth
-      - eapol_flow_received, gem_port_added, eap_start_sent, eap_response_identity_sent, eap_response_challenge_sent, eap_response_success_received, auth_failed, dhcp_ack_received, dhcp_failed
+      - enabled, eap_start_sent, eap_response_identity_sent, eap_response_challenge_sent, eap_response_success_received, auth_failed, dhcp_ack_received, dhcp_failed
       - auth_started
-      -
+      - Requires that both the EAPOL flow has been received and the GemPort added
     * - eap_start_sent
       - auth_started
       - eap_start_sent
@@ -65,9 +57,9 @@
       - auth_failed
       -
     * - start_dhcp
-      - eap_response_success_received, dhcp_discovery_sent, dhcp_request_sent, dhcp_ack_received, dhcp_failed
+      - enabled, eap_response_success_received, dhcp_discovery_sent, dhcp_request_sent, dhcp_ack_received, dhcp_failed
       - dhcp_started
-      -
+      - Requires that both the DHCP flow has been received and the GemPort added. In addition the transtition from the ``enabled`` state is only allowed if Auth is set to false
     * - dhcp_discovery_sent
       - dhcp_started
       - dhcp_discovery_sent
@@ -169,7 +161,6 @@
                 enabled
                 disabled [fillcolor="#f9d6ff"]
             }
-            gem_port_added
 
             {created, disabled} -> initialized -> discovered -> enabled
         }
@@ -179,7 +170,6 @@
             style=dotted
             node [fillcolor="#e6ffc2"]
 
-            eapol_flow_received
             auth_started
             eap_start_sent
             eap_response_identity_sent
@@ -229,8 +219,8 @@
             dhcp_ack_received -> dhcp_started
             dhcp_failed -> dhcp_started
         }
-        enabled -> gem_port_added -> eapol_flow_received -> auth_started
-        enabled -> eapol_flow_received -> gem_port_added -> auth_started
+        enabled -> auth_started
+        enabled -> dhcp_started
 
         {dhcp_ack_received, dhcp_failed} -> auth_started