diff --git a/src/hilight.c b/src/hilight.c
index 087c9ca6..d23f4338 100644
--- a/src/hilight.c
+++ b/src/hilight.c
@@ -1442,6 +1442,7 @@ void logic_set(int value, int num)
   static int map[] = {LOGIC_0, LOGIC_1, LOGIC_X, LOGIC_Z};
   struct hilight_hashentry  *entry;
  
+  tclsetvar("tclstop", "0");
   prepare_netlist_structs(0);
   if(!xctx->simdata.valid) create_simdata();
   rebuild_selected_array();
diff --git a/xschem_library/devices/diode.sym b/xschem_library/devices/diode.sym
index 74450ed3..92f13cfa 100644
--- a/xschem_library/devices/diode.sym
+++ b/xschem_library/devices/diode.sym
@@ -1,8 +1,9 @@
-v {xschem version=2.9.9 file_version=1.2 }
+v {xschem version=3.0.0 file_version=1.2 }
 G {}
 K {type=diode
 format="@name @pinlist @model area=@area"
-
+function1="U H 0 M"
+function0="L U 1 M"
 tedax_format="footprint @name @footprint
 value @name @value
 device @name @device
@@ -17,8 +18,8 @@ E {}
 L 4 0 5 0 30 {}
 L 4 0 -30 0 -5 {}
 L 4 -10 5 10 5 {}
-B 5 -2.5 -32.5 2.5 -27.5 {name=p dir=inout pinnumber=1 propag=1}
-B 5 -2.5 27.5 2.5 32.5 {name=m dir=inout pinnumber=2}
+B 5 -2.5 -32.5 2.5 -27.5 {name=p dir=inout pinnumber=1 propag=1 goto=1}
+B 5 -2.5 27.5 2.5 32.5 {name=m dir=inout pinnumber=2 goto=0}
 P 4 4 -0 5 -10 -5 10 -5 0 5 {fill=true}
 T {@#0:pinnumber} -5 -26.25 0 1 0.2 0.2 {layer=13}
 T {@#1:pinnumber} -5 17.5 0 1 0.2 0.2 {layer=13}
diff --git a/xschem_library/xschem_simulator/switch_level_sim.sch b/xschem_library/xschem_simulator/switch_level_sim.sch
index 1cd83853..7b2a2684 100644
--- a/xschem_library/xschem_simulator/switch_level_sim.sch
+++ b/xschem_library/xschem_simulator/switch_level_sim.sch
@@ -1,4 +1,4 @@
-v {xschem version=2.9.9 file_version=1.2 }
+v {xschem version=3.0.0 file_version=1.2 }
 G {}
 K {}
 V {}
@@ -312,9 +312,9 @@ C {switch-1.sym} 1370 -1260 0 0 {name=s4}
 C {inv_2.sym} 1370 -1190 0 0 {name=x20 VGND=VGND VNB=VNB VPB=VPB VPWR=VPWR prefix=sky130_fd_sc_hd__ }
 C {diode_3.sym} 1270 -1280 0 0 {name=x12 VTH=0.6 RON=10 ROFF=1G}
 C {ipin.sym} 70 -170 0 0 { name=p19 lab=B }
+C {dev-1.sym} 1530 -620 0 1 {name=s3}
 C {invert-1.sym} 1370 -620 0 0 {name=s1}
 C {dev-1.sym} 1210 -620 0 0 {name=s2}
-C {dev-1.sym} 1530 -620 0 1 {name=s3}
 C {vdd.sym} 1080 -620 0 0 {name=l9 lab=VCC}
 C {lab_pin.sym} 850 -1160 0 1 {name=p40 lab=E}
 C {ipin.sym} 70 -130 0 0 { name=p69 lab=D }