diff --git a/neuron/presynapse.md b/neuron/presynapse.md
index e1deacb..935b975 100644
--- a/neuron/presynapse.md
+++ b/neuron/presynapse.md
@@ -53,11 +53,13 @@ Qui riportiamo la struttura della espressione G e una descrizione di come legger
   - il rilascio di NT avviene in base:
     -  alla concetrazione di Ca2+
     -  alla concentrazione di Rrp (readily release pool)
+  - l'accumulo di CaTraces avviene durante AP_ctx. Qui cerchiamo di catturare il livello medio che raggiunge Ca2+ durante varie spike. Non lo possiamo catturare in NOT AP_ctx perche' li facciamo clearance.
 
-
-- NOT AP_ctx: quando la presynapsi e' in fase di "riposo":
-  - slkd
-
+- NOT AP_ctx: quando la presynapsi e' in fase di "riposo" fra AP facciamo pulizia. Questo riposo e' inter AP non quello alla fine di uno spike train:
+  - eCB clearance
+  - Ca2+Traces clearance
+  - RPShuttle
+  - RefillRPGlutamine (sec)
 
 ---
 
@@ -199,11 +201,7 @@ interacting: NTreleaseHigh
     trace: None
 ```
 
-### NOT AP_ctx: PRESYNAPSE
-
-#### ms: NOT AP_ctx: PRESYNAPSE
-
-##### CaTracesAccumulationLow: interacting
+##### Ca2+TracesAccumulationLow: interacting
 
 Serve a dare la velocita' al trasporto di vesicles da RP a RRP. The biological meaning is that a synapse that has just been through a burst is primed for fast recovery — the molecular machinery for vesicle docking is already engaged, calcium-dependent priming factors are still elevated, and the system is in a ready state. A synapse that has been silent for several seconds has cooled down and replenishes slowly.
 
@@ -214,10 +212,10 @@ The result is that Tr_Ca encodes not the instantaneous calcium level but the rec
 ---
 
 ```Gen
-interacting: CaTracesAccumulationLow
+interacting: Ca2+TracesAccumulationLow
   contained_by: PRESYNAPSE
 
-  in_context: NOT AP_ctx
+  in_context: AP_ctx
   rf: ( active: 24x ) # Low
 
   hypothesis: (Ca2+ mediumness)
@@ -225,15 +223,15 @@ interacting: CaTracesAccumulationLow
     trace: None
 ```
 
-##### CaTracesAccumulationHigh: interacting
+##### Ca2+TracesAccumulationHigh: interacting
 
 Qui le tracce CaTrace si accumulano di piu' perche' RF e' minore, se c'e' la condizione, perche' va a fare il controllo piu' spesso.
 
 ```Gen
-interacting: CaTracesAccumulationHigh
+interacting: Ca2+TracesAccumulationHigh
   contained_by: PRESYNAPSE
 
-  in_context: NOT AP_ctx
+  in_context: AP_ctx
   rf: ( active: 12x ) # high
 
   hypothesis: (Ca2+ fullness)
@@ -241,6 +239,10 @@ interacting: CaTracesAccumulationHigh
     trace: None
 ```
 
+### NOT AP_ctx: PRESYNAPSE
+
+#### ms: NOT AP_ctx: PRESYNAPSE
+
 #### sec: NOT AP_ctx: PRESYNAPSE
 
 ##### eCB clearance: interacting
@@ -261,12 +263,12 @@ interacting: eCBClearance
     trace: None
 ```
 
-##### CaTracesClearance: interacting
+##### Ca2+TracesClearance: interacting
 
 Qui non facciamo un flush di Catrace, riduciamo ogni mezzo secondo (context) di un RF di questo episodio.
 
 ```Gen
-interacting: CaTracesClearance
+interacting: Ca2+TracesClearance
   contained_by: PRESYNAPSE
 
   in_context: NOT AP_ctx
@@ -342,7 +344,7 @@ interacting: RPShuttleHigh
 
 #### min: NOT AP_ctx: PRESYNAPSE
 
-##### Refill RP from Glutamine
+##### RefillRPGlutamine
 
 This happens in the minutes loop, once per minute, via the glutamine shuttle from the astrocyte. It is a two-step process across two cells.
 
@@ -512,7 +514,7 @@ interacting: Ca2+enterHigh
 
 #### ms: NOT AP_ctx: VGCC-PRE
 
-##### CaClearanceLow: interacting
+##### Ca2+ClearanceLow: interacting
 
 Qui eliminiamo Ca2+. Non non comprendiamo anche il ristabilimento del Voltage, con altri Ioni entranti e uscenti, per ora tutto dipende da AP del SOMA. Non comprendiamo per ora:
 - PMCA: primary, ATP-dependent
@@ -525,7 +527,7 @@ Qui disinguiamo:
 - da capire se serve veramente questa distinzione anche in bae alle tracce di Ca2+ che prendiamo in presynapse.
 
 ```Gen
-interacting: NotAP-CaClearance
+interacting: Ca2+ClearanceLow
   contained_by: PRESYNAPSE
 
   in_context: NOT AP_ctx
@@ -536,10 +538,10 @@ interacting: NotAP-CaClearance
     trace: None
 ```
 
-##### CaClearanceHigh: interacting
+##### Ca2+ClearanceHigh: interacting
 
 ```Gen
-interacting: NotAP-CaClearance
+interacting: Ca2+ClearanceHigh
   contained_by: PRESYNAPSE
 
   in_context: NOT AP_ctx