--- a/src/lte/doc/source/helpers.seqdiag	Wed Sep 28 17:40:44 2011 +0200
+++ b/src/lte/doc/source/helpers.seqdiag	Wed Oct 19 19:02:58 2011 +0200
@@ -5,21 +5,23 @@
 LenaHelper => EpcHelper [label="AddEnb"] {
   EpcHelper  -> EpcHelper [label="create EpcEnbApplication"];
   EpcHelper  -> EpcHelper [label="Setup S1 link"];
+  EpcHelper  => EpcSgwPgwApplication [label="AddEnb (enbIpv4Address)"];
 }
 
-LenaHelper => EpcHelper [label="ActivateEpsBearer"] {
-  EpcHelper => EpcSgwPgwApplication [label="CreateSessionRequestOrBearerResourceCommand", return="TEID"] {
-    EpcSgwPgwApplication => EpcSgwPgwApplication [label="Setup S1 Bearer"];
+
+LenaHelper => LteUeRrc [label="GetRnti", return="RNTI"]
+LenaHelper => LteEnbRrc [label="SetupRadioBearer", return="LCID"] 
+
+LenaHelper => EpcHelper [label="ActivateEpsBearer(UE IP, eNB IP, TFT, RNTI, LCID)"] {
+  EpcHelper => EpcSgwPgwApplication [label="ActivateS1Bearer (UE IP, eNB IP, TFT)", return="TEID"] {
+    EpcSgwPgwApplication => EpcSgwPgwApplication [label="Store UE IP<->eNB IP mapping"];
+    EpcSgwPgwApplication => EpcSgwPgwApplication [label="Create GTP-U tunnel endpoint"];
   }
-  EpcHelper => EpcEnbApplication [label="ErabSetupRequest(TEID)"] {
-    EpcEnbApplication => EpcEnbApplication [label="Setup S1 Bearer"];
-    EpcEnbApplication => LteEnbNetDevice [label="SetupRadioBearer", return="RBID"] {
-      LteEnbNetDevice -> LteEnbNetDevice [label="Setup Radio Bearer"]
-    }
-    EpcEnbApplication -> EpcEnbApplication [label="store TEID<->RBID mapping"]
-  }
-
-  
+  EpcHelper => EpcEnbApplication [label="ErabSetupRequest(TEID, RNTI, LCID	)"] {
+    EpcEnbApplication -> EpcEnbApplication [label="Create GTP-U tunnel endpoint (TEID)"];
+    EpcEnbApplication -> EpcEnbApplication [label="store TEID<->(RNTI,LCID) mapping"]
+  }  
 }
+    
 
 }
\ No newline at end of file

--- a/src/lte/doc/source/lte-design.rst	Wed Sep 28 17:40:44 2011 +0200
+++ b/src/lte/doc/source/lte-design.rst	Wed Oct 19 19:02:58 2011 +0200
@@ -399,10 +399,20 @@
 Helpers
 +++++++
 
-Note: the role of the MME is taken by the EpcHelper, since we don't have an MME at the moment (the current code supports data plane only).
 
 .. seqdiag:: helpers.seqdiag
 
+A few notes on the above diagram:
+
+  * the role of the MME is taken by the EpcHelper, since we don't have
+    an MME at the moment (the current code supports data plane only);
+
+  * in a real LTE/EPC system, the setup of the RadioBearer comes after
+    the setup of the S1 bearer, but here due to the use of Helpers
+    instead of S1-AP messages we do it the other way around
+    (RadioBearers first, then S1 bearer) because of easier
+    implementation. This is fine to do since the current code focuses
+    on control plane only.