diff --git a/elements/neuron/postsynapse.md b/elements/neuron/postsynapse.md
index 0351cae..e5e0c2a 100644
--- a/elements/neuron/postsynapse.md
+++ b/elements/neuron/postsynapse.md
@@ -14,44 +14,51 @@ Expansions and modulations:
 
 ```Gen
 
-include: 
-  post_ampa.md
-  
 POSTSYNAPSE
 
-  type: comprehension
-
-  expansion:
-     _@PostAmpaAll: TUB [ comprehension: POST-AMPA, full: 10x, active: 5x, empty: 2x ]
-
-  intrication:
-    # Scope
-    !DAY: INTRICATION [ ref: &ORGANISM.!DAY ]
-    !NIGHT: INTRICATION [ ref: &ORGANISM.!NIGHT ]
-
-    # Context  
-    *bAP: INTRICATION [ ref: &SOMA.*bAP ]
-    *TunPossible: INTRICATION [ ref: &NEURON.*TunPossible ]
+    type: comprehension
     
-    # Tub
-    _NT: INTRICATION [ ref: &ASTROSYNAPSE._NT ] 
-    _Vpost: INTRICATION [ ref: ??._VPost ]
+    include: post_ampa.md
+
+    // ########################## Intrication ##########################
+    
+    
+        // Scope
+    !DAY: INTRICATE [ scope: &ORGANISM.!DAY ]
+    !NIGHT: INTRICATE [ scope: &ORGANISM.!NIGHT ]
+
+        // Context  
+    *bAP: INTRICATE [ context: &SOMA.*bAP ]
+    *TunPossible: INTRICATE [ context: &NEURON.*TunPossible ]
+    
+        // Tub
+    _NT: INTRICATE [ tub: &ASTROSYNAPSE._NT ] 
+    _Vpost: INTRICATE [ tub: ??._VPost ]
    
-  instantiation:
-    # Context
+  // ########################## Instantiation ##########################
+  
+        // Context
 
-    # Tub
-    _Ca2: TUB [ full: 60x, active: 30x, empty: 0x ]
-    _Na: TUB [ full: 60x, active: 30x, empty: 0x ]
-    _Nox: TUB [ full: 100x, active: 20x, empty: 0x ] # Nitric Oxide (NO):  A gas that diffuses freely.
-    _eCB: TUB [ full: 100x, active: 20x, empty: 0x ] # Endocannabinoids (e.g., 2-AG)
+        // Tub
+    _Ca2: INSTANTIATE [ tub: local, full: 60x, act: 30x, empty: 0x ]
+    _Na: INSTANTIATE [ tub: local, full: 60x, act: 30x, empty: 0x ]
+    _Nox: INSTANTIATE [ tub: local, full: 100x, act: 20x, empty: 0x ] # Nitric Oxide (NO):  A gas that diffuses freely.
+    _eCB: INSTANTIATE [ tub: local, full: 100x, act: 20x, empty: 0x ] # Endocannabinoids (e.g., 2-AG)
     
-    _posMod: TUB [ full: None, active: ??, empty: 0x)  # riferimento a possible di BEH-PRE
-    _actMod: TUB [ full: None, active: ??, empty: ??)  # riferimento a active di BEH-PRE
+    _posMod: INSTANTIATE [ tub: local, full: None, act: ??, empty: 0x)  # riferimento a possible di BEH-PRE
+    _actMod: INSTANTIATE [ tub: local, full: None, act: ??, empty: ??)  # riferimento a active di BEH-PRE
 
-    # Behaviour
-    $: BEHAVIOUR [ behaviour: MAIN_POST ]
-    $: BEHAVIOUR [ behaviour: TUN-POST-AMPA ]
+        // Container
+    void: INSTANTIATE [ scope: !DAY, container: ACTION, context:  *bAP ]
+    void: INSTANTIATE [ scope: !DAY, container: RECOVERY, context:  NOT *bAP,  *Spike_train ]
+    void: INSTANTIATE [ scope: !DAY, container: PREPARE, context: * NOT Spike_train ]
+    void: INSTANTIATE [ scope: !NIGHT, container: ACTION, context:  *Not_rem_1 ]
+    void: INSTANTIATE [ scope: !NIGHT, container: RECOVERY, context:  *Not_rem_2 ]
+    void: INSTANTIATE [ scope: !NIGHT, container: PREPARE, context:  *Rem ]
+
+    // ########################## Expansion ##########################
+    
+    _@PostAmpaAll: INSTANTIATE [ tub: EXPAND [ comprehension: POST-AMPA ], full: 10x, active: 5x, empty: 2x ]
 
 ```
 
@@ -64,7 +71,9 @@ POSTSYNAPSE
 - **_eCB**:
 - **_Nox**:?
 
-### MAIN_POST: !DAY
+## !DAY | ACTION | *bAP 
+
+//### MAIN_POST: !DAY
 ```
 MAIN_POST
   type: behaviour
@@ -89,12 +98,12 @@ MAIN_POST
 
 ```
 
-#### *bAP
+//#### *bAP
 
 ![post-ltp-ltd.png](.attachments/post-ltp-ltd.png)
 
 
-##### CaNDMAEnterMax
+//##### CaNDMAEnterMax
 
 ```Gen
 CaNDMAEnterMax
@@ -108,7 +117,7 @@ CaNDMAEnterMax
       trace: 
 ```
 
-##### CaNDMAEnterMed
+//##### CaNDMAEnterMed
 
 ```Gen
 CaNDMAEnterMed
@@ -121,9 +130,10 @@ CaNDMAEnterMed
       trace: 
 ```
 
-#### NOT *bAP
+## !DAY | RECOVERY | NOT *bAP, *Spike_train
+//#### NOT *bAP
 
-##### CaNDMAEnterLow
+//##### CaNDMAEnterLow
 
 ```Gen
 CaNDMAEnterLow
@@ -136,7 +146,7 @@ CaNDMAEnterLow
       trace: 
 ```
 
-##### CaNDMAEnterMedNotBap
+//##### CaNDMAEnterMedNotBap
 
 ```Gen
 CaNDMAEnterMedNotBap
@@ -149,7 +159,7 @@ CaNDMAEnterMedNotBap
       trace: 
 ```
 
-##### CaClearance
+//##### CaClearance
 
 ```Gen
 CaClearance # Low
@@ -162,7 +172,7 @@ CaClearance # Low
       trace: None
 ```
 
-##### VPostMax
+//##### VPostMax
 ```Gen
 VPostMa
     type: accumulator
@@ -174,7 +184,7 @@ VPostMa
       trace: None
 ```
 
-##### VPostMed
+//##### VPostMed
 ```Gen
 VPostMed
     type: accumulator
@@ -186,7 +196,7 @@ VPostMed
       trace: None
 ```
 
-##### VPostMin
+//##### VPostMin
 ```Gen
 VPostMin
     type: accumulator
@@ -199,7 +209,7 @@ VPostMin
 ```
 
 Il VPost clearance lo facciamo qui nel container dove creaiamo anche i VPost, perche' altrimenti, se lo facessimo in DB, perderemmo l'aspetto temporale della contribuzione dei singoli POST.
-##### VPostClearance
+//##### VPostClearance
 ```Gen
 VPostClearance
     type: accumulator
@@ -213,7 +223,7 @@ VPostClearance
 
 Il NA clearance lo mettiamo qui come sniplet, perche' gli AMPA creano, e questi pompano fuori. Qui non e' un problema di perdere l'integrazione temporale, perche' gli AMPA sono tutti uguali nel loro behavior. Abbiamo messo gli AMPA come container perche' cosi' possiamo modularne la numerosita'.
 
-##### NaClearanceHigh
+//##### NaClearanceHigh
 ```Gen
 NaClearanceHigh
     type: accumulator
@@ -225,7 +235,7 @@ NaClearanceHigh
       trace: None
 ```
 
-##### NaClearanceLow
+//##### NaClearanceLow
 ```Gen
 NaClearanceLow
     type: accumulator
@@ -237,7 +247,7 @@ NaClearanceLow
       trace: None
 ```
 
-### TUN-POST-AMPA: !DAY
+//### TUN-POST-AMPA: !DAY
 ```Gen
 TUN-POST-AMPA
   type: behaviour
@@ -256,9 +266,9 @@ TUN-POST-AMPA
   
   
 ```
-#### *TunPossible
+//#### *TunPossible
 
-##### CheckTunPostAmpa
+//##### CheckTunPostAmpa
 ```Gen
 CheckTunPostAmpa
   type: contextor
@@ -271,7 +281,7 @@ CheckTunPostAmpa
     out_context: *TryTunDownPostAmpa
 ```
 
-##### PossibleUpPostAmpaTun
+//##### PossibleUpPostAmpaTun
 ```Gen
 PossibleUpPostAmpaTun: ( active: 10x )
   type: accumulator
@@ -282,7 +292,7 @@ PossibleUpPostAmpaTun: ( active: 10x )
       trace: 
 ```
 
-##### PossibleDownPostAmpaTun
+//##### PossibleDownPostAmpaTun
 ```Gen
 PossibleDownPostAmpaTun
   type: accumulator
@@ -292,3 +302,12 @@ PossibleDownPostAmpaTun
       action: 
       trace: 
 ```
+
+## !DAY | PREPARE | NOT *Spike_train 
+
+## !NIGHT | ACTION | *Not_rem_1
+
+## !NIGHT | RECOVERY | *Not_rem_2
+
+## !NIGHT | PREPARE | *Rem
+