diff --git a/neuron/axon.md b/neuron/axon.md
index dfd1cbc..be03a85 100644
--- a/neuron/axon.md
+++ b/neuron/axon.md
@@ -57,7 +57,17 @@ container: AXON
 
 **G expression**:
 
-— ms:
+— tpc: PRE_Status_ms
+
+- ctx%AP
+-- NTreleaseMax_ctx
+--- ..
+
+— NOT AP_ctx:
+
+- RPShuttle_ctx
+- CaTracesNotEmpty_ctx
+- eCBNotEmpty_ctx
 
 ---
 
@@ -112,7 +122,7 @@ RF di interacting deve essere MOLTO piu' basso di un RF di AP. In maniera da ess
 check_tpc: PRE_Status_ms
   contained_by: PRESYNAPSE
 
-  in_context: AP
+  in_context: AP_ctx
   rf: ( active: 60x )
 
   condition: ( Ca2+ full ) AND ( Rrp fullness ) 
@@ -243,7 +253,7 @@ interacting: AP-CaClearanceMediumness
 interacting: NotAP-CaClearance
   contained_by: PRESYNAPSE
 
-  in_context: NOT AP
+  in_context: NOT AP_ctx
   rf: ( active: 24x ) # Low
 
   hypothesis: NOT (Ca2+ empty)
@@ -267,7 +277,7 @@ Qui le tracce CaTrace si accumulano di piu' perche' RF e' minore, se c'e' la con
 interacting: CaTracesAccumulationFast
   contained_by: PRESYNAPSE
 
-  in_context: NOT AP
+  in_context: NOT AP_ctx
   rf: ( active: 12x ) # fast
 
   hypothesis: (Ca2+ fullness)
@@ -281,7 +291,7 @@ interacting: CaTracesAccumulationFast
 interacting: CaTracesAccumulationSlow
   contained_by: PRESYNAPSE
 
-  in_context: NOT AP
+  in_context: NOT AP_ctx
   rf: ( active: 24x ) # Slow
 
   hypothesis: (Ca2+ mediumness)
@@ -299,17 +309,17 @@ Contestualizziamo in maniera Fixed ogni mezzo secondo?
 check_tpc: PRE_Status_sec
   contained_by: PRESYNAPSE
 
-  in_context: NOT AP
+  in_context: NOT AP_ctx
   rf: ( active: 600x )
 
   condition: NOT (RP empty) AND NOT (RRP full)
-    out_context: RPShuttle
+    out_context: RPShuttle_ctx
 
   condition: NOT (CaTrace empty) 
-    out_context: CaTracesNotEmpty
+    out_context: CaTracesNotEmpty_ctx
 
   condition: NOT (eCB empy) 
-    out_context: eCBNotEmpty
+    out_context: eCBNotEmpty_ctx
 ```
 
 #### eCB clearance: interacting
@@ -322,7 +332,7 @@ Qui non facciamo un flush di eCB, riduciamo ogni mezzo secondo (context) di un R
 interacting: eCBClearance
   contained_by: PRESYNAPSE
 
-  in_context: eCBNotEmpty
+  in_context: eCBNotEmpty_ctx
   rf: ( active: 24x ) # Slow
 
   hypothesis: NOT (eCB empty)
@@ -338,7 +348,7 @@ Qui non facciamo un flush di Catrace, riduciamo ogni mezzo secondo (context) di
 interacting: CaTracesClearance
   contained_by: PRESYNAPSE
 
-  in_context: CaTracesNotEmpty
+  in_context: CaTracesNotEmpty_ctx
   rf: ( active: 24x ) # Slow
 
   hypothesis: NOT (CaTrace empty)
@@ -360,7 +370,7 @@ Rate: 0.00 – 0.25
 interacting: RPShuttleSlow
   contained_by: PRESYNAPSE
 
-  in_context: RPShuttle
+  in_context: RPShuttle_ctx
   rf: ( active: 48x ) # Slow
 
   hypothesis: (CaTrace emptiness) OR (RP emptiness) OR (RRP fullness)  
@@ -378,7 +388,7 @@ Rate: 0.50 – 0.97
 interacting: RPShuttleModerate
   contained_by: PRESYNAPSE
 
-  in_context: RPShuttle
+  in_context: RPShuttle_ctx
   rf: ( active: 24x ) # Slow
 
   hypothesis: ((CaTrace mediumness) AND (RP mediumness) AND (RRP mediumness)) OR 
@@ -399,7 +409,7 @@ Rate: 1.25 – 1.94
 interacting: RPShuttleFast
   contained_by: PRESYNAPSE
 
-  in_context: RPShuttle
+  in_context: RPShuttle_ctx
   rf: ( active: 12x ) # Fast
 
   hypothesis: ((CaTrace fullness) AND (RP fullness) AND (RRP mediumness)) OR # signal + supply
@@ -419,7 +429,7 @@ Rate: 2.50 – 5.00
 interacting: RPShuttleMaximal
   contained_by: PRESYNAPSE
 
-  in_context: RPShuttle
+  in_context: RPShuttle_ctx
   rf: ( active: 6x ) # Maximal
 
   hypothesis: (CaTrace fullness) AND (RP fullness) AND RRP (emptiness)
@@ -554,7 +564,7 @@ Devo controllare che le condizioni sotto siano esaustive.
 interacting: Ca2+enterOpen
   contained_by: VGCC-PRE
 
-  in_context: AP
+  in_context: AP_ctx
   rf: ( active: 6x )
 
   hypothesis: (Ca2+ empty) and (eCB empty)
@@ -568,7 +578,7 @@ interacting: Ca2+enterOpen
 interacting: Ca2+enterReduced-partial
   contained_by: VGCC-PRE
 
-  in_context: AP
+  in_context: AP_ctx
   rf: ( active: 6x )
 
   hypothesis: (Ca2+ mediumness) OR ((eCB mediumness) AND (Ca2+ empty)) OR ((eCB full) AND (Ca2+ empty) AND (NT empty))
@@ -582,7 +592,7 @@ interacting: Ca2+enterReduced-partial
 interacting: Ca2+enterSupressed
   contained_by: VGCC-PRE
 
-  in_context: AP
+  in_context: AP_ctx
   rf: ( active: 6x )
 
   hypothesis: ((Ca2+ mediumness) AND (eCB full) OR (eCB mediumness))