diff --git a/src/xschem.tcl b/src/xschem.tcl
index 8bd28c70..16337f68 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -406,7 +406,7 @@ proc sim_is_xyce {} {
 
 proc set_sim_defaults {} {
   ### spice 
-  global sim terminal USER_CONF_DIR has_x
+  global sim terminal USER_CONF_DIR has_x bespice_listen_port env
 
   set failure 0
   if { [info exists has_x] && [winfo exists .sim] } {
@@ -472,8 +472,13 @@ proc set_sim_defaults {} {
     set_ne sim(spicewave,2,name) {Rawtovcd}
     set_ne sim(spicewave,2,fg) 0
     set_ne sim(spicewave,2,st) 0
+
+    set_ne sim(spicewave,3,cmd) {$env(HOME)/analog_flavor_eval/bin/bspwave --socket localhost $bespice_listen_port "$n.raw" } 
+    set_ne sim(spicewave,3,name) {bespice wave viewer}
+    set_ne sim(spicewave,3,fg) 0
+    set_ne sim(spicewave,3,st) 0
     # number of configured spice wave viewers, and default one
-    set_ne sim(spicewave,n) 3
+    set_ne sim(spicewave,n) 4
     set_ne sim(spicewave,default) 0
     
     ### verilog
@@ -946,7 +951,8 @@ proc waves {} {
   ## $S : schematic name full path (/home/schippes/.xschem/xschem_library/opamp.sch)
   ## $d : netlist directory
 
-  global netlist_dir netlist_type computerfarm terminal sim XSCHEM_SHAREDIR has_x
+  global netlist_dir netlist_type computerfarm terminal sim XSCHEM_SHAREDIR has_x 
+  global bespice_listen_port env
 
   simuldir
   set_sim_defaults
@@ -3613,6 +3619,10 @@ set_ne computerfarm {} ;# 20151007
 # set a port number in xschemrc if you want accept remote connections.
 set_ne xschem_listen_port {}
 
+# server for bespice waveform connection (listen to port and send commands to bespice if set)
+# set a port number in xschemrc if you want xschem to be able to cross-probe to bespice
+set_ne bespice_listen_port {}
+
 # hide instance details (show only bbox) 
 set_ne hide_symbols 0
 # show net names if symbol has attributes like @#n:net_name (where n = pin number or pin name) 
diff --git a/src/xschemrc b/src/xschemrc
index d87e17b1..4e6f26ae 100644
--- a/src/xschemrc
+++ b/src/xschemrc
@@ -286,6 +286,12 @@
 #### set xschem listening port; default: not enabled
 # set xschem_listen_port 2021
 
+###########################################################################
+#### BESPICE WAVE SOCKET CONNECTION
+###########################################################################
+#### set bespice wave listening port; default: not enabled
+set bespice_listen_port 2022
+
 ###########################################################################
 #### UTILE SPICE STIMULI DESCRIPTION LANGUAGE AND TRANSLATOR
 ###########################################################################
diff --git a/xschem_library/examples/cmos_example.sch b/xschem_library/examples/cmos_example.sch
index 493093db..2ca76242 100644
--- a/xschem_library/examples/cmos_example.sch
+++ b/xschem_library/examples/cmos_example.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 {}
@@ -94,11 +94,14 @@ value=".temp 30
 .option savecurrents
 .save all @m4[gm] @m5[gm] @m1[gm]
 .control
+save all
 op
+* tran 1n 300n
+* dc vvcc 0 5 0.01
 write cmos_example.raw
 .endc
 
-"  net_name=true}
+"}
 C {lab_pin.sym} 500 -430 0 0 {name=p12 lab=G  net_name=true}
 C {launcher.sym} 700 -60 0 0 {name=h1
 descr=Backannotate