diff --git a/winnertakeall/BHE-WTA.md b/winnertakeall/BHE-WTA.md
index 6ff46c6..0a77a64 100644
--- a/winnertakeall/BHE-WTA.md
+++ b/winnertakeall/BHE-WTA.md
@@ -25,20 +25,21 @@ In questo modo abbiamo allargato il concetto di espansione. Problemi da risolver
 
 When parser sees:
 
-NEU-001 -[EXH-001]-> NEU-003 ~AST-001
+- EXH-001: NEU-001, NEU-003, AST-001
 
-It looks up `EXH-001`:
+Template lookup:
 
-EXH-001: N.AXO -[excites]-> N.BD-001
-    modulated_by: TUN-WTA-PRE-POST from TUN-WTA
+- EXH-001: {SRC}.AXO -[excites]-> {TGT}.BD(001) ~{AST}
 
-And substitutes `N` with the actual neurons:
+Substitution:
 
-presynaptic:  NEU-001.AXO
-postsynaptic: NEU-003.BD-001
-type:         excitatory
-astrocyte:    AST-001
-modulated_by: TUN-WTA.TUN-WTA-PRE-POST
+- {SRC} = NEU-001
+- {TGT} = NEU-003
+- {AST} = AST-001
+
+Result:
+
+- NEU-001.AXO -[excites]-> NEU-003.BD(001) ~AST-001
 
 ---
 
@@ -64,30 +65,23 @@ container: BEH-WTA
     - OUT-002
 
   expansion_template:
-    - EXH-001: N.AXO -[exhites]-> N.BD-001 ~AST
-        modulated_by: TUN-WTA-PRE-POST from TUN-WTA
-
-    - EXH-002: N.AXO -[exhites]-> N.BD-002 ~AST
-        modulated_by: TUN-WTA-PRE-POST from TUN-WTA
-
-    - EXH-003: N.AXO -[exhites]-> N.BD-003 ~AST
-        modulated_by: TUN-WTA-PRE-POST from TUN-WTA
-
-    - INH-001: N.AXO -[inhibits]-> N.SOMA ~AST
-        modulated_by: TUN-WTA-PRE-SOMA from TUN-WTA
+      EXH-001: {SRC}.AXO -[excites]-> {TGT}.BD(001) ~{AST} # BD1
+      EXH-002: {SRC}.AXO -[excites]-> {TGT}.BD(002) ~{AST} # BD2
+      EXH-003: {SRC}.AXO -[excites]-> {TGT}.BD(003) ~{AST} # BD3
+      INH-001: {SRC}.AXO -[inhibits]-> {TGT}.SOMA ~{AST}
 
   circuit:
-    AREA-001:
-      - NEU-001 -[EXH-001]-> NEU-003 ~AST-001
-      - NEU-001 -[INH-001]-> NEU-003 ~AST-002
+      AREA-001:
+          - EXH-001: NEU-001, NEU-003, AST-001
+          - INH-001: NEU-002, NEU-003, AST-002
 
-    AREA-002:
-      - NEU-003 -[EXH-002]-> NEU-003 ~AST-001
-      - NEU-004 -[EXH-003]-> NEU-003 ~AST-002
+      AREA-002:
+          - EXH-002: NEU-003, NEU-003, AST-001
+          - EXH-003: NEU-004, NEU-003, AST-002
 
-    AREA-003:
-      - INC-001 -[INH-001]-> NEU-001 ~@
-      - OUT-002 -[EXH-001]-> NEU-003 ~@
+      AREA-003:
+          - INH-001: INC-001, NEU-001, @
+          - EXH-001: NEU-003, OUT-001, @
 ```
 
 ### excitory: Expansion
@@ -106,5 +100,4 @@ expansion: excitory
 ```Gen
 expansion: inhibitory
   contained_by: BEH-WTA
-
-```
+```
\ No newline at end of file