all examples tested for json storagev2.0

84 files changed, 148 insertions, 202 deletions

diff --git a/4_bit_JK_ff/4_bit_JK_ff_Previous_Values.xml b/4_bit_JK_ff/4_bit_JK_ff_Previous_Values.xml
deleted file mode 100644
index c0b3009..0000000
--- a/4_bit_JK_ff/4_bit_JK_ff_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis><source><v1 name="Source type">dc<field1 name="Value">5</field1></v1><v3 name="Source type">dc<field1 name="Value">5</field1></v3><v4 name="Source type">0</v4><v2 name="Source type">pulse<field1 name="Initial Value">0</field1><field2 name="Pulse Value">5</field2><field3 name="Delay Time">0.1m</field3><field4 name="Rise Time">0.1m</field4><field5 name="Fall Time">0.1m</field5><field5 name="Pulse width">20m</field5><field5 name="Period">40m</field5></v2><v10 name="Source type">0</v10><v11 name="Source type">0</v11><v9 name="Source type">0</v9><v8 name="Source type">0</v8><v6 name="Source type">0</v6><v7 name="Source type">0</v7><v5 name="Source type">0</v5></source><model><u3 name="type">d_jkff<field1 name="Enter IC (default=0)" /><field2 name="Enter Fall Delay (default=1.0e-9)" /><field3 name="Enter Set Delay (default=1.0e-9)" /><field4 name="Enter value for Set Load (default=1.0e-12)" /><field5 name="Enter Clk Delay (default=1.0e-9)" /><field6 name="Enter value for Clk Load (default=1.0e-12)" /><field7 name="Enter Reset Delay (default=1.0)" /><field8 name="Enter Rise Delay (default=1.0e-9)" /><field9 name="Enter value for JK Load (default=1.0e-12)" /><field10 name="Enter value for Reset Load (default=1.0e-12)" /></u3><u5 name="type">d_jkff<field11 name="Enter IC (default=0)" /><field12 name="Enter Fall Delay (default=1.0e-9)" /><field13 name="Enter Set Delay (default=1.0e-9)" /><field14 name="Enter value for Set Load (default=1.0e-12)" /><field15 name="Enter Clk Delay (default=1.0e-9)" /><field16 name="Enter value for Clk Load (default=1.0e-12)" /><field17 name="Enter Reset Delay (default=1.0)" /><field18 name="Enter Rise Delay (default=1.0e-9)" /><field19 name="Enter value for JK Load (default=1.0e-12)" /><field20 name="Enter value for Reset Load (default=1.0e-12)" /></u5><u7 name="type">d_jkff<field21 name="Enter IC (default=0)" /><field22 name="Enter Fall Delay (default=1.0e-9)" /><field23 name="Enter Set Delay (default=1.0e-9)" /><field24 name="Enter value for Set Load (default=1.0e-12)" /><field25 name="Enter Clk Delay (default=1.0e-9)" /><field26 name="Enter value for Clk Load (default=1.0e-12)" /><field27 name="Enter Reset Delay (default=1.0)" /><field28 name="Enter Rise Delay (default=1.0e-9)" /><field29 name="Enter value for JK Load (default=1.0e-12)" /><field30 name="Enter value for Reset Load (default=1.0e-12)" /></u7><u10 name="type">d_jkff<field31 name="Enter IC (default=0)" /><field32 name="Enter Fall Delay (default=1.0e-9)" /><field33 name="Enter Set Delay (default=1.0e-9)" /><field34 name="Enter value for Set Load (default=1.0e-12)" /><field35 name="Enter Clk Delay (default=1.0e-9)" /><field36 name="Enter value for Clk Load (default=1.0e-12)" /><field37 name="Enter Reset Delay (default=1.0)" /><field38 name="Enter Rise Delay (default=1.0e-9)" /><field39 name="Enter value for JK Load (default=1.0e-12)" /><field40 name="Enter value for Reset Load (default=1.0e-12)" /></u10><u6 name="type">d_and<field41 name="Enter Fall Delay (default=1.0e-9)" /><field42 name="Enter Input Load (default=1.0e-12)" /><field43 name="Enter Rise Delay (default=1.0e-9)" /></u6><u8 name="type">d_and<field44 name="Enter Fall Delay (default=1.0e-9)" /><field45 name="Enter Input Load (default=1.0e-12)" /><field46 name="Enter Rise Delay (default=1.0e-9)" /></u8><u4 name="type">adc_bridge<field47 name="Enter Fall Delay (default=1.0e-9)" /><field48 name="Enter value for in_high (default=2.0)" /><field49 name="Enter Rise Delay (default=1.0e-9)" /><field50 name="Enter value for in_low (default=1.0)" /></u4><u2 name="type">adc_bridge<field51 name="Enter Fall Delay (default=1.0e-9)" /><field52 name="Enter value for in_high (default=2.0)" /><field53 name="Enter Rise Delay (default=1.0e-9)" /><field54 name="Enter value for in_low (default=1.0)" /></u2><u1 name="type">adc_bridge<field55 name="Enter Fall Delay (default=1.0e-9)" /><field56 name="Enter value for in_high (default=2.0)" /><field57 name="Enter Rise Delay (default=1.0e-9)" /><field58 name="Enter value for in_low (default=1.0)" /></u1><u9 name="type">dac_bridge<field59 name="Enter value for input load (default=1.0e-12)" /><field60 name="Enter value for out_low (default=0.0)" /><field61 name="Enter value for out_high (default=5.0)" /><field62 name="Enter the Rise Time (default=1.0e-9)" /><field63 name="Enter the Fall Time (default=1.0e-9)" /><field64 name="Enter value for out_undef (default=0.5)" /></u9><u11 name="type">dac_bridge<field65 name="Enter value for input load (default=1.0e-12)" /><field66 name="Enter value for out_low (default=0.0)" /><field67 name="Enter value for out_high (default=5.0)" /><field68 name="Enter the Rise Time (default=1.0e-9)" /><field69 name="Enter the Fall Time (default=1.0e-9)" /><field70 name="Enter value for out_undef (default=0.5)" /></u11></model><devicemodel /><subcircuit /></KicadtoNgspice>
\ No newline at end of file
diff --git a/AstableMultivibratorIC555/AstableMultivibratorIC555_Previous_Values.xml b/AstableMultivibratorIC555/AstableMultivibratorIC555_Previous_Values.xml
deleted file mode 100644
index 93845f0..0000000
--- a/AstableMultivibratorIC555/AstableMultivibratorIC555_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">5</field1></v1></source><model><u2 name="type">ic<field1 name="Enter initial voltage at node for u2  net-_c1-pad1_ ic">0</field1></u2></model><devicemodel /><subcircuit><x1><field>/home/fossee/esim-updated/eSim/src/SubcircuitLibrary/lm555n</field></x1></subcircuit><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">50</field2><field3 name="Stop Time">5</field3><field4 name="Start Combo">us</field4><field5 name="Step Combo">ns</field5><field6 name="Stop Combo">us</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/AstableMultivibratorIC555/lm555n.bak b/AstableMultivibratorIC555/lm555n.bak
index 6b8426e..92d1f7a 100644
--- a/AstableMultivibratorIC555/lm555n.bak
+++ b/AstableMultivibratorIC555/lm555n.bak
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Monday 17 December 2012 11:00:30 AM IST
+EESchema Schematic File Version 2  date Monday 17 December 2012 10:48:46 AM IST
 LIBS:power
 LIBS:device
 LIBS:transistors
diff --git a/AstableMultivibratorIC555/lm555n.cir b/AstableMultivibratorIC555/lm555n.cir
index 144b715..8f6f81c 100644
--- a/AstableMultivibratorIC555/lm555n.cir
+++ b/AstableMultivibratorIC555/lm555n.cir
@@ -1,4 +1,4 @@
-* EESchema Netlist Version 1.1 (Spice format) creation date: Monday 17 December 2012 11:00:36 AM IST
+* EESchema Netlist Version 1.1 (Spice format) creation date: Monday 17 December 2012 10:57:49 AM IST
 
 * To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
 * To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
@@ -7,9 +7,9 @@
 U5  5 21 D_INVERTER		
 U6  1 4 5 21 21 8 10 D_SRLATCH		
 E2  18 0 23 14 10000		
-U4  19 20 11 12 LIMIT8		
-U3  8 10 7 9 DAC8		
-U2  11 12 6 4 1 5 ADC8		
+*U4  19 20 11 12 LIMIT8		
+*U3  8 10 7 9 DAC8		
+*U2  11 12 6 4 1 5 ADC8		
 U1  22 14 7 6 15 16 3 13 PORT		
 R8  9 2 1500		
 Q1  22 2 3 QNOM		
diff --git a/AstableMultivibratorIC555/lm555n.cir.ckt b/AstableMultivibratorIC555/lm555n.cir.ckt
index f45920f..90f04a3 100644
--- a/AstableMultivibratorIC555/lm555n.cir.ckt
+++ b/AstableMultivibratorIC555/lm555n.cir.ckt
@@ -1,4 +1,4 @@
-* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 11:00:36 am ist
+* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 10:57:49 am ist
 
 * Inverter d_inverter
 * SR Latch d_srlatch
@@ -25,7 +25,7 @@ a2 1 4 5 21 21 8 10 u6
 +sr_delay=1e-12 enable_delay=1e-12 set_delay=1e-12 reset_delay=1e-12)
 a3 19 11 u4
 a4 20 12 u4
-.model u4 limit(out_lower_limit=0.0 out_upper_limit=5.0 in_offset=0.0 gain=1.0)
+.model u4 limit(out_lower_limit=0.0 out_upper_limit=5.0)
 a5 [8] [7] u3
 a6 [10] [9] u3
 .model u3 dac_bridge(out_low=0.2 out_high=5.0 out_undef=5.0 )
diff --git a/AstableMultivibratorIC555/lm555n.cir.out b/AstableMultivibratorIC555/lm555n.cir.out
index f45920f..21ca75a 100644
--- a/AstableMultivibratorIC555/lm555n.cir.out
+++ b/AstableMultivibratorIC555/lm555n.cir.out
@@ -1,14 +1,11 @@
-* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 11:00:36 am ist
+* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 10:57:49 am ist
 
-* Inverter d_inverter
-* SR Latch d_srlatch
+* u5  5 21 d_inverter
+* u6  1 4 5 21 21 8 10 d_srlatch
 e2  18 0 23 14 10000
-* Limiter limit8
-* Digital to Analog converter dac8
-* Analog to Digital converter adc8
-u1  22 14 7 6 15 16 3 13 port
+* u1  22 14 7 6 15 16 3 13 port
 r8  9 2 1500
-q1 3 2 22 qnom
+q1  22 2 3 qnom
 r7  18 20 25
 r6  17 19 25
 e1  17 0 16 15 10000
@@ -18,18 +15,17 @@ r3  23 22 5000
 r2  15 23 5000
 r1  13 15 5000
 a1 5 21 u5
-.model u5 d_inverter(rise_delay=1e-12 fall_delay=1e-12 input_load=1e-12)
 a2 1 4 5 21 21 8 10 u6
-.model u6 d_srlatch(rise_delay=1e-12 fall_delay=1e-12 ic=0
-+sr_load=1e-12 enable_load=1e-12 set_load=1e-12 reset_load=1e-12
-+sr_delay=1e-12 enable_delay=1e-12 set_delay=1e-12 reset_delay=1e-12)
-a3 19 11 u4
-a4 20 12 u4
-.model u4 limit(out_lower_limit=0.0 out_upper_limit=5.0 in_offset=0.0 gain=1.0)
-a5 [8] [7] u3
-a6 [10] [9] u3
-.model u3 dac_bridge(out_low=0.2 out_high=5.0 out_undef=5.0 )
-a7 [11] [4] u2
-a8 [12] [1] u2
-a9 [6] [5] u2
-.model u2 adc_bridge(in_low=0.8 in_high=2.0 )
+* Schematic Name: d_inverter, NgSpice Name: d_inverter
+.model u5 d_inverter(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 ) 
+* Schematic Name: d_srlatch, NgSpice Name: d_srlatch
+.model u6 d_srlatch(ic=0 sr_load=1.0e-12 set_delay=1.0e-9 set_load=1.0e-12 sr_delay=1.0e-9 reset_load=1.0e-12 enable_delay=1.0e-9 reset_delay=1.0e-9 rise_delay=1.0e-9 fall_delay=1.0e-9 enable_load=1.0e-12 ) 
+.ac oct 897897 kjadsfhHz jhdsakjHz
+
+* Control Statements 
+.control
+run
+print allv > plot_data_v.txt
+print alli > plot_data_i.txt
+.endc
+.end
diff --git a/AstableMultivibratorIC555/lm555n.pro b/AstableMultivibratorIC555/lm555n.pro
index 5329ee0..c8e151f 100644
--- a/AstableMultivibratorIC555/lm555n.pro
+++ b/AstableMultivibratorIC555/lm555n.pro
@@ -1,46 +1,73 @@
-update=Thu May 19 16:58:03 2016
+update=Monday 19 November 2012 04:56:38 PM IST
 last_client=eeschema
 [eeschema]
 version=1
 LibDir=/home/yogesh/FreeEDA/library
+NetFmt=1
+HPGLSpd=20
+HPGLDm=15
+HPGLNum=1
+offX_A4=0
+offY_A4=0
+offX_A3=0
+offY_A3=0
+offX_A2=0
+offY_A2=0
+offX_A1=0
+offY_A1=0
+offX_A0=0
+offY_A0=0
+offX_A=0
+offY_A=0
+offX_B=0
+offY_B=0
+offX_C=0
+offY_C=0
+offX_D=0
+offY_D=0
+offX_E=0
+offY_E=0
+RptD_X=0
+RptD_Y=100
+RptLab=1
+LabSize=60
 [eeschema/libraries]
-LibName1=lm555n-rescue
-LibName2=power
-LibName3=device
-LibName4=transistors
-LibName5=conn
-LibName6=linear
-LibName7=regul
-LibName8=74xx
-LibName9=cmos4000
-LibName10=adc-dac
-LibName11=memory
-LibName12=xilinx
-LibName13=special
-LibName14=microcontrollers
-LibName15=dsp
-LibName16=microchip
-LibName17=analog_switches
-LibName18=motorola
-LibName19=texas
-LibName20=intel
-LibName21=audio
-LibName22=interface
-LibName23=digital-audio
-LibName24=philips
-LibName25=display
-LibName26=cypress
-LibName27=siliconi
-LibName28=opto
-LibName29=atmel
-LibName30=contrib
-LibName31=valves
-LibName32=analogSpice
-LibName33=analogXSpice
-LibName34=converterSpice
-LibName35=digitalSpice
-LibName36=linearSpice
-LibName37=measurementSpice
-LibName38=portSpice
-LibName39=sourcesSpice
-LibName40=digitalXSpice
+LibName1=power
+LibName2=device
+LibName3=transistors
+LibName4=conn
+LibName5=linear
+LibName6=regul
+LibName7=74xx
+LibName8=cmos4000
+LibName9=adc-dac
+LibName10=memory
+LibName11=xilinx
+LibName12=special
+LibName13=microcontrollers
+LibName14=dsp
+LibName15=microchip
+LibName16=analog_switches
+LibName17=motorola
+LibName18=texas
+LibName19=intel
+LibName20=audio
+LibName21=interface
+LibName22=digital-audio
+LibName23=philips
+LibName24=display
+LibName25=cypress
+LibName26=siliconi
+LibName27=opto
+LibName28=atmel
+LibName29=contrib
+LibName30=valves
+LibName31=analogSpice
+LibName32=analogXSpice
+LibName33=converterSpice
+LibName34=digitalSpice
+LibName35=linearSpice
+LibName36=measurementSpice
+LibName37=portSpice
+LibName38=sourcesSpice
+LibName39=digitalXSpice
diff --git a/AstableMultivibratorIC555/lm555n.sch b/AstableMultivibratorIC555/lm555n.sch
index 417063b..fabbb66 100644
--- a/AstableMultivibratorIC555/lm555n.sch
+++ b/AstableMultivibratorIC555/lm555n.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Monday 17 December 2012 11:00:43 AM IST
+EESchema Schematic File Version 2  date Monday 17 December 2012 10:57:52 AM IST
 LIBS:power
 LIBS:device
 LIBS:transistors
diff --git a/AstableMultivibratorIC555/lm555n.sub b/AstableMultivibratorIC555/lm555n.sub
index beeefc4..862626e 100644
--- a/AstableMultivibratorIC555/lm555n.sub
+++ b/AstableMultivibratorIC555/lm555n.sub
@@ -1,14 +1,11 @@
 * Subcircuit lm555n
 .subckt lm555n 22 14 7 6 15 16 3 13 
-* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 11:00:36 am ist
-* Inverter d_inverter
-* SR Latch d_srlatch
+* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 10:57:49 am ist
+* u5  5 21 d_inverter
+* u6  1 4 5 21 21 8 10 d_srlatch
 e2  18 0 23 14 10000
-* Limiter limit8
-* Digital to Analog converter dac8
-* Analog to Digital converter adc8
 r8  9 2 1500
-q1 3 2 22 qnom
+q1  22 2 3 qnom
 r7  18 20 25
 r6  17 19 25
 e1  17 0 16 15 10000
@@ -18,20 +15,11 @@ r3  23 22 5000
 r2  15 23 5000
 r1  13 15 5000
 a1 5 21 u5
-.model u5 d_inverter(rise_delay=1e-12 fall_delay=1e-12 input_load=1e-12)
 a2 1 4 5 21 21 8 10 u6
-.model u6 d_srlatch(rise_delay=1e-12 fall_delay=1e-12 ic=0
-+sr_load=1e-12 enable_load=1e-12 set_load=1e-12 reset_load=1e-12
-+sr_delay=1e-12 enable_delay=1e-12 set_delay=1e-12 reset_delay=1e-12)
-a3 19 11 u4
-a4 20 12 u4
-.model u4 limit(out_lower_limit=0.0 out_upper_limit=5.0 in_offset=0.0 gain=1.0)
-a5 [8] [7] u3
-a6 [10] [9] u3
-.model u3 dac_bridge(out_low=0.2 out_high=5.0 out_undef=5.0 )
-a7 [11] [4] u2
-a8 [12] [1] u2
-a9 [6] [5] u2
-.model u2 adc_bridge(in_low=0.8 in_high=2.0 )
+* Schematic Name: d_inverter, NgSpice Name: d_inverter
+.model u5 d_inverter(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+* Schematic Name: d_srlatch, NgSpice Name: d_srlatch
+.model u6 d_srlatch(ic=0 sr_load=1.0e-12 set_delay=1.0e-9 set_load=1.0e-12 sr_delay=1.0e-9 reset_load=1.0e-12 enable_delay=1.0e-9 reset_delay=1.0e-9 rise_delay=1.0e-9 fall_delay=1.0e-9 enable_load=1.0e-12 )
+* Control Statements
 
 .ends lm555n
\ No newline at end of file
diff --git a/AstableMultivibratorIC555/lm555n_Previous_Values.xml b/AstableMultivibratorIC555/lm555n_Previous_Values.xml
deleted file mode 100644
index 58d33ec..0000000
--- a/AstableMultivibratorIC555/lm555n_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source /><model><u5 name="type">d_inverter<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter Input Load (default=1.0e-12)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /></u5><u6 name="type">d_srlatch<field4 name="Enter IC (default=0)" /><field5 name="Enter value for SR Load (default=1.0e-12)" /><field6 name="Enter Set Delay (default=1.0e-9)" /><field7 name="Enter value for Set Load (default=1.0e-12)" /><field8 name="Enter SR Delay (default=1.0e-9)" /><field9 name="Enter Enable Delay (default=1.0e-9)" /><field10 name="Enter Reset Delay (default=1.0)" /><field11 name="Enter Rise Delay (default=1.0e-9)" /><field12 name="Enter Fall Delay (default=1.0e-9)" /><field13 name="Enter value for Reset Load (default=1.0e-12)" /><field14 name="Enter value for Enable Load (default=1.0e-12)" /></u6></model><devicemodel><q1><field /></q1></devicemodel><analysis><ac><field1 name="Lin">false</field1><field2 name="Dec">false</field2><field3 name="Oct">true</field3><field4 name="Start Frequency">kjadsfh</field4><field5 name="Stop Frequency">jhdsakj</field5><field6 name="No. of points">897897</field6><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">False</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/BJT_Biascircuit/BJT_Biascircuit.cir.out b/BJT_Biascircuit/BJT_Biascircuit.cir.out
index 257b2d2..bdee4a2 100644
--- a/BJT_Biascircuit/BJT_Biascircuit.cir.out
+++ b/BJT_Biascircuit/BJT_Biascircuit.cir.out
@@ -1,7 +1,6 @@
 * /home/fossee/esim-workspace/bjt_biascircuit/bjt_biascircuit.cir
 
-.include NPN.lib
-q1 net-_q1-pad1_ net-_q1-pad2_ gnd Q2N2222
+q1  net-_q1-pad1_ net-_q1-pad2_ gnd npn
 v1 vce gnd  dc 12
 r1  net-_r1-pad1_ net-_q1-pad1_ 1k
 r2  net-_q1-pad2_ ib 1k
diff --git a/BJT_Biascircuit/BJT_Biascircuit_Previous_Values.xml b/BJT_Biascircuit/BJT_Biascircuit_Previous_Values.xml
deleted file mode 100644
index ee9c07c..0000000
--- a/BJT_Biascircuit/BJT_Biascircuit_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">12</field1></v1><vic2 name="Source type">0</vic2><i1 name="Source type">dc<field1 name="Value">20m</field1></i1><v_u1 name="Source type">0</v_u1></source><model /><devicemodel><q1><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/Transistor/NPN.lib</field></q1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1">v1</field1><field2 name="Start">0</field2><field3 name="Increment">0.05</field3><field4 name="Stop">10</field4><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2">i1</field9><field10 name="Start">0</field10><field11 name="Increment">1</field11><field12 name="Stop">5</field12><field13 name="Start Combo">mV or mA</field13><field14 name="Increment Combo">mV or mA</field14><field15 name="Stop Combo">mV or mA</field15></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/BJT_CB_config/BJT_CB_config.cir.out b/BJT_CB_config/BJT_CB_config.cir.out
index 616fdaf..3ab4115 100644
--- a/BJT_CB_config/BJT_CB_config.cir.out
+++ b/BJT_CB_config/BJT_CB_config.cir.out
@@ -1,7 +1,6 @@
 * /home/fossee/updatedexamples/bjt_cb_config/bjt_cb_config.cir
 
-.include NPN.lib
-q1 net-_q1-pad1_ gnd net-_q1-pad3_ Q2N2222
+q1  net-_q1-pad1_ gnd net-_q1-pad3_ npn
 v1 vcb gnd  dc 12
 r1  net-_r1-pad1_ net-_q1-pad1_ 1k
 r2  net-_q1-pad3_ ie 1k
diff --git a/BJT_CB_config/BJT_CB_config_Previous_Values.xml b/BJT_CB_config/BJT_CB_config_Previous_Values.xml
deleted file mode 100644
index 2841bcd..0000000
--- a/BJT_CB_config/BJT_CB_config_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">12</field1></v1><i1 name="Source type">dc<field1 name="Value">20m</field1></i1><v_u_ic1 name="Source type">0</v_u_ic1></source><model /><devicemodel><q1><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/Transistor/NPN.lib</field></q1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1">v1</field1><field2 name="Start">-1</field2><field3 name="Increment">0.02</field3><field4 name="Stop">5</field4><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2">i1</field9><field10 name="Start">-1</field10><field11 name="Increment">1</field11><field12 name="Stop">5</field12><field13 name="Start Combo">mV or mA</field13><field14 name="Increment Combo">mV or mA</field14><field15 name="Stop Combo">mV or mA</field15></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/BJT_CE_config/BJT_CE_config.cir.out b/BJT_CE_config/BJT_CE_config.cir.out
index b7c56d1..cdab01d 100644
--- a/BJT_CE_config/BJT_CE_config.cir.out
+++ b/BJT_CE_config/BJT_CE_config.cir.out
@@ -1,7 +1,6 @@
 * /home/fossee/updatedexamples/bjt_ce_config/bjt_ce_config.cir
 
-.include NPN.lib
-q1 net-_q1-pad1_ net-_q1-pad2_ gnd Q2N2222
+q1  net-_q1-pad1_ net-_q1-pad2_ gnd npn
 v1 vce gnd  dc 0
 r1  net-_r1-pad1_ net-_q1-pad1_ 1k
 r2  net-_q1-pad2_ ib 1k
diff --git a/BJT_CE_config/BJT_CE_config_Previous_Values.xml b/BJT_CE_config/BJT_CE_config_Previous_Values.xml
deleted file mode 100644
index 97705d1..0000000
--- a/BJT_CE_config/BJT_CE_config_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">0</field1></v1><vic2 name="Source type">0</vic2><i1 name="Source type">dc<field1 name="Value">20m</field1></i1><v_u_ic1 name="Source type">0</v_u_ic1></source><model /><devicemodel><q1><field>/home/fossee/eSim_Master/eSim/src/deviceModelLibrary/Transistor/NPN.lib</field></q1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1">v1</field1><field2 name="Start">0</field2><field3 name="Increment">0.05</field3><field4 name="Stop">5</field4><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2">i1</field9><field10 name="Start">0</field10><field11 name="Increment">1</field11><field12 name="Stop">5</field12><field13 name="Start Combo">mV or mA</field13><field14 name="Increment Combo">mV or mA</field14><field15 name="Stop Combo">mV or mA</field15></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/BJT_Frequency_Response/BJT_Frequency_Response.cir.out b/BJT_Frequency_Response/BJT_Frequency_Response.cir.out
index 98cd439..5fb5127 100644
--- a/BJT_Frequency_Response/BJT_Frequency_Response.cir.out
+++ b/BJT_Frequency_Response/BJT_Frequency_Response.cir.out
@@ -1,12 +1,11 @@
 * /home/fossee/esim-workspace/bjt_frequency_response/bjt_frequency_response.cir
 
-.include NPN.lib
 v1 net-_r2-pad1_ gnd  dc 10
 v2 in gnd  ac 0.5 0
 c1  net-_c1-pad1_ net-_c1-pad2_ 40u
 c2  gnd net-_c2-pad2_ 100u
 c3  out net-_c3-pad2_ 40u
-q1 net-_c3-pad2_ net-_c1-pad2_ net-_c2-pad2_ Q2N2222
+q1  net-_c3-pad2_ net-_c1-pad2_ net-_c2-pad2_ npn
 r3  net-_c1-pad2_ gnd 50k
 r4  net-_c2-pad2_ gnd 1.5k
 r6  out gnd 1k
diff --git a/BJT_Frequency_Response/BJT_Frequency_Response_Previous_Values.xml b/BJT_Frequency_Response/BJT_Frequency_Response_Previous_Values.xml
deleted file mode 100644
index aa9b378..0000000
--- a/BJT_Frequency_Response/BJT_Frequency_Response_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">10</field1></v1><v2 name="Source type">ac<field1 name="Amplitude">0.5</field1><field2 name="Phase" /></v2></source><model /><devicemodel><q1><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/Transistor/NPN.lib</field></q1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">false</field1><field2 name="Dec">true</field2><field3 name="Oct">false</field3><field4 name="Start Frequency">10</field4><field5 name="Stop Frequency">100</field5><field6 name="No. of points">100</field6><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Meg</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/BJT_amplifier/BJT_amplifier.cir.out b/BJT_amplifier/BJT_amplifier.cir.out
index a320263..bab393c 100644
--- a/BJT_amplifier/BJT_amplifier.cir.out
+++ b/BJT_amplifier/BJT_amplifier.cir.out
@@ -1,6 +1,5 @@
 * /home/fossee/esim-workspace/bjt_amplifier/bjt_amplifier.cir
 
-.include NPN.lib
 v1 net-_r2-pad1_ gnd  dc 10
 r1  net-_c1-pad1_ in 50
 r2  net-_r2-pad1_ net-_c1-pad2_ 200k
@@ -11,7 +10,7 @@ c2  gnd net-_c2-pad2_ 100u
 c3  out net-_c3-pad2_ 40u
 r5  net-_r2-pad1_ net-_c3-pad2_ 2k
 r4  net-_c2-pad2_ gnd 1.5k
-q1 net-_c3-pad2_ net-_c1-pad2_ net-_c2-pad2_ Q2N2222
+q1  net-_c3-pad2_ net-_c1-pad2_ net-_c2-pad2_ npn
 * u1  in plot_v1
 * u2  out plot_v1
 v2  in gnd sine(0 10m 1k 0 0)
diff --git a/BJT_amplifier/BJT_amplifier_Previous_Values.xml b/BJT_amplifier/BJT_amplifier_Previous_Values.xml
deleted file mode 100644
index a5cf427..0000000
--- a/BJT_amplifier/BJT_amplifier_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">10</field1></v1><v2 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">10m</field2><field3 name="Frequency">1k</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v2></source><model /><devicemodel><q1><field>/home/fossee/esim-clones/eSim/src/deviceModelLibrary/Transistor/NPN.lib</field></q1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">false</field1><field2 name="Dec">true</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">10</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">us</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/BasicGates/BasicGates.cir.out b/BasicGates/BasicGates.cir.out
index 428fd72..1e92db7 100644
--- a/BasicGates/BasicGates.cir.out
+++ b/BasicGates/BasicGates.cir.out
@@ -40,7 +40,7 @@ a8 [a b ] [net-_u1-pad3_ net-_u1-pad4_ ] u1
 .model u8 dac_bridge(out_undef=0.5 out_low=0.0 out_high=5.0 t_rise=1.0e-9 t_fall=1.0e-9 input_load=1.0e-12 ) 
 * Schematic Name: adc_bridge_2, NgSpice Name: adc_bridge
 .model u1 adc_bridge(fall_delay=1.0e-9 in_high=2.0 rise_delay=1.0e-9 in_low=1.0 ) 
-.tran 10e-06 30e-06 0e-00
+.tran 10e-06 30e-06 0e-06
 
 * Control Statements 
 .control
diff --git a/BasicGates/BasicGates_Previous_Values.xml b/BasicGates/BasicGates_Previous_Values.xml
deleted file mode 100644
index cac329c..0000000
--- a/BasicGates/BasicGates_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v2 name="Source type">pulse<field1 name="Initial Value">0</field1><field2 name="Pulse Value">5</field2><field3 name="Delay Time">0.1u</field3><field4 name="Rise Time">0.1u</field4><field5 name="Fall Time">0.1u</field5><field5 name="Pulse width">2u</field5><field5 name="Period">20u</field5></v2><v1 name="Source type">pulse<field1 name="Initial Value">5</field1><field2 name="Pulse Value">0</field2><field3 name="Delay Time">0.1u</field3><field4 name="Rise Time">0.1u</field4><field5 name="Fall Time">0.1u</field5><field5 name="Pulse width">2u</field5><field5 name="Period">20u</field5></v1></source><model><u2 name="type">d_and<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter Input Load (default=1.0e-12)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /></u2><u3 name="type">d_or<field4 name="Enter Fall Delay (default=1.0e-9)" /><field5 name="Enter Input Load (default=1.0e-12)" /><field6 name="Enter Rise Delay (default=1.0e-9)" /></u3><u4 name="type">d_nor<field7 name="Enter Fall Delay (default=1.0e-9)" /><field8 name="Enter Input Load (default=1.0e-12)" /><field9 name="Enter Rise Delay (default=1.0e-9)" /></u4><u5 name="type">d_nand<field10 name="Enter Fall Delay (default=1.0e-9)" /><field11 name="Enter Input Load (default=1.0e-12)" /><field12 name="Enter Rise Delay (default=1.0e-9)" /></u5><u6 name="type">d_inverter<field13 name="Enter Fall Delay (default=1.0e-9)" /><field14 name="Enter Input Load (default=1.0e-12)" /><field15 name="Enter Rise Delay (default=1.0e-9)" /></u6><u7 name="type">d_xor<field16 name="Enter Fall Delay (default=1.0e-9)" /><field17 name="Enter Input Load (default=1.0e-12)" /><field18 name="Enter Rise Delay (default=1.0e-9)" /></u7><u8 name="type">dac_bridge<field19 name="Enter value for input load (default=1.0e-12)" /><field20 name="Enter value for out_low (default=0.0)" /><field21 name="Enter value for out_high (default=5.0)" /><field22 name="Enter the Rise Time (default=1.0e-9)" /><field23 name="Enter the Fall Time (default=1.0e-9)" /><field24 name="Enter value for out_undef (default=0.5)" /></u8><u1 name="type">adc_bridge<field25 name="Enter Fall Delay (default=1.0e-9)" /><field26 name="Enter value for in_high (default=2.0)" /><field27 name="Enter Rise Delay (default=1.0e-9)" /><field28 name="Enter value for in_low (default=1.0)" /></u1></model><devicemodel /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">30</field3><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">us</field5><field6 name="Stop Combo">us</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/BasicGates/analysis b/BasicGates/analysis
index 2acaeed..7c136a9 100644
--- a/BasicGates/analysis
+++ b/BasicGates/analysis
@@ -1 +1 @@
-.tran 10e-06 30e-06 0e-00
\ No newline at end of file
+.tran 10e-06 30e-06 0e-06
\ No newline at end of file
diff --git a/CMOS_Inverter/CMOS_Inverter.cir.out b/CMOS_Inverter/CMOS_Inverter.cir.out
index eb31bda..695d01a 100644
--- a/CMOS_Inverter/CMOS_Inverter.cir.out
+++ b/CMOS_Inverter/CMOS_Inverter.cir.out
@@ -1,15 +1,13 @@
 * /home/fossee/updatedexamples/cmos_inverter/cmos_inverter.cir
 
-.include NMOS-180nm.lib
-.include PMOS-180nm.lib
 v2  vcc gnd 5
-m1 out in gnd gnd CMOSN W=100u L=100u M=1
-m2 out in vcc vcc CMOSP W=100u L=100u M=1
+m1  out in gnd gnd mos_n
+m2  out in vcc vcc mos_p
 * u1  in plot_v1
 * u2  out plot_v1
 c1  out gnd 1u
 v1  in gnd pwl(0m 0 0.5m 5 50m 5 50.5m 0 100m 0)
-.tran 10e-03 100e-03 0e-03
+.tran 10e-03 100e-03 0e-00
 
 * Control Statements 
 .control
diff --git a/CMOS_Inverter/CMOS_Inverter_Previous_Values.xml b/CMOS_Inverter/CMOS_Inverter_Previous_Values.xml
deleted file mode 100644
index 5a4bb82..0000000
--- a/CMOS_Inverter/CMOS_Inverter_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis><source><v2 name="Source type">5</v2><v1 name="Source type">pwl<field1 name="Enter in pwl format">0m 0 0.5m 5 50m 5 50.5m 0 100m 0</field1></v1></source><model /><devicemodel><m1><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/MOS/NMOS-180nm.lib</field><field /><field /><field /></m1><m2><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/MOS/PMOS-180nm.lib</field><field /><field /><field /></m2></devicemodel><subcircuit /></KicadtoNgspice>
\ No newline at end of file
diff --git a/CMOS_Inverter/analysis b/CMOS_Inverter/analysis
index 660a46c..d5e1354 100644
--- a/CMOS_Inverter/analysis
+++ b/CMOS_Inverter/analysis
@@ -1 +1 @@
-.tran 10e-03 100e-03 0e-03
\ No newline at end of file
+.tran 10e-03 100e-03 0e-00
\ No newline at end of file
diff --git a/Clampercircuit/Clampercircuit.cir.out b/Clampercircuit/Clampercircuit.cir.out
index 8ebcb64..6230790 100644
--- a/Clampercircuit/Clampercircuit.cir.out
+++ b/Clampercircuit/Clampercircuit.cir.out
@@ -1,12 +1,11 @@
 * /home/fossee/esim-workspace/clampercircuit/clampercircuit.cir
 
-.include D.lib
 v1  in_neg gnd sine(0 5 50 0 0)
 c1  out_neg in_neg 1n
-d1 out_neg gnd 1N4148
+d1  out_neg gnd d
 v2  in_pos gnd sine(0 5 50 0 0)
 c2  out_pos in_pos 1n
-d2 gnd out_pos 1N4148
+d2  gnd out_pos d
 * u1  in_neg plot_v1
 * u2  out_neg plot_v1
 * u3  in_pos plot_v1
diff --git a/Clampercircuit/Clampercircuit_Previous_Values.xml b/Clampercircuit/Clampercircuit_Previous_Values.xml
deleted file mode 100644
index f58b615..0000000
--- a/Clampercircuit/Clampercircuit_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">5</field2><field3 name="Frequency">50</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v1><v2 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">5</field2><field3 name="Frequency">50</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v2></source><model /><devicemodel><d2><field>/home/fossee/esim-clones/eSim/src/deviceModelLibrary/Diode/D.lib</field></d2><d1><field>/home/fossee/esim-clones/eSim/src/deviceModelLibrary/Diode/D.lib</field></d1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Clippercircuit/Clippercircuit.cir.out b/Clippercircuit/Clippercircuit.cir.out
index 712215c..684f987 100644
--- a/Clippercircuit/Clippercircuit.cir.out
+++ b/Clippercircuit/Clippercircuit.cir.out
@@ -1,9 +1,8 @@
 * /home/fossee/esim-workspace/clippercircuit/clippercircuit.cir
 
-.include D.lib
 v1  in gnd sine(0 5 50 0 0)
-d1 gnd out 1N4148
-d2 out gnd 1N4148
+d1  gnd out d
+d2  out gnd d
 r1  in out 1k
 * u1  in plot_v1
 * u2  out plot_v1
diff --git a/Clippercircuit/Clippercircuit_Previous_Values.xml b/Clippercircuit/Clippercircuit_Previous_Values.xml
deleted file mode 100644
index 76fa575..0000000
--- a/Clippercircuit/Clippercircuit_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">5</field2><field3 name="Frequency">50</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v1></source><model /><devicemodel><d2><field>/home/fossee/esim-clones/eSim/src/deviceModelLibrary/Diode/D.lib</field></d2><d1><field>/home/fossee/esim-clones/eSim/src/deviceModelLibrary/Diode/D.lib</field></d1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Diac_Triac/Diac_Triac_Previous_Values.xml b/Diac_Triac/Diac_Triac_Previous_Values.xml
deleted file mode 100644
index 98d546f..0000000
--- a/Diac_Triac/Diac_Triac_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">100</field2><field3 name="Frequency">100</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v1></source><model /><devicemodel /><subcircuit><x2><field>/home/fossee/esim-updated/eSim/src/SubcircuitLibrary/triac</field></x2><x1><field>/home/fossee/esim-updated/eSim/src/SubcircuitLibrary/diac</field></x1></subcircuit><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">20</field2><field3 name="Stop Time">20</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">us</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Diac_Triac/diac_Previous_Values.xml b/Diac_Triac/diac_Previous_Values.xml
deleted file mode 100644
index 96df431..0000000
--- a/Diac_Triac/diac_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source /><model><u1 name="type">aswitch<field1 name="Enter Log (default=TRUE)" /><field2 name="Enter Control OFF value (default=0.0)">0.1</field2><field3 name="Enter OFF Resistance (default=1.0e12)">1000000</field3><field4 name="Enter ON Resistance (default=1.0)">0.0125</field4><field5 name="Enter Control ON value(default=1.0)">25</field5></u1><u2 name="type">aswitch<field6 name="Enter Log (default=TRUE)" /><field7 name="Enter Control OFF value (default=0.0)">-0.1</field7><field8 name="Enter OFF Resistance (default=1.0e12)">1000000</field8><field9 name="Enter ON Resistance (default=1.0)">0.0125</field9><field10 name="Enter Control ON value(default=1.0)">-25</field10></u2></model><devicemodel /><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Diac_Triac/triac_Previous_Values.xml b/Diac_Triac/triac_Previous_Values.xml
deleted file mode 100644
index 80da52b..0000000
--- a/Diac_Triac/triac_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v3 name="Source type">dc<field1 name="Value">0</field1></v3><v2 name="Source type">dc<field1 name="Value">0</field1></v2><v1 name="Source type">dc<field1 name="Value">0</field1></v1></source><model><u1 name="type">aswitch<field1 name="Enter Log (default=TRUE)" /><field2 name="Enter Control OFF value (default=0.0)">0.1</field2><field3 name="Enter OFF Resistance (default=1.0e12)">1000000</field3><field4 name="Enter ON Resistance (default=1.0)">0.0125</field4><field5 name="Enter Control ON value(default=1.0)">1</field5></u1><u2 name="type">aswitch<field6 name="Enter Log (default=TRUE)" /><field7 name="Enter Control OFF value (default=0.0)">-0.1</field7><field8 name="Enter OFF Resistance (default=1.0e12)">1000000</field8><field9 name="Enter ON Resistance (default=1.0)">0.0125</field9><field10 name="Enter Control ON value(default=1.0)">-1</field10></u2></model><devicemodel><d2><field>/opt/eSim/src/deviceModelLibrary/Diode/PowerDiode.lib</field></d2><d1><field>/opt/eSim/src/deviceModelLibrary/Diode/PowerDiode.lib</field></d1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Differentiator/Differentiator.cir.out b/Differentiator/Differentiator.cir.out
index 61fac7e..dafc01c 100644
--- a/Differentiator/Differentiator.cir.out
+++ b/Differentiator/Differentiator.cir.out
@@ -7,10 +7,10 @@ r1  in net-_c1-pad1_ 100k
 r2  net-_r2-pad1_ gnd 1k
 r4  out gnd 1k
 c1  net-_c1-pad1_ net-_c1-pad2_ 20n
-v1  in gnd pwl(0m 0 0.5m 5 25m 5 25.5m -5 50m -5 50.5m 5 75m 5 75.5m -5 100m -5)
+v1  in gnd pwl(0m 0 0.5m 5 50m 5 50.5m 0 100m 0)
 * u1  in plot_v1
 * u2  out plot_v1
-.tran 10e-03 100e-03 0e-03
+.tran 10e-03 100e-03 0e-00
 
 * Control Statements 
 .control
diff --git a/Differentiator/Differentiator_Previous_Values.xml b/Differentiator/Differentiator_Previous_Values.xml
deleted file mode 100644
index ffabf04..0000000
--- a/Differentiator/Differentiator_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">pwl<field1 name="Enter in pwl format">0m 0 0.5m 5 25m 5 25.5m -5 50m -5 50.5m 5 75m 5 75.5m -5 100m -5</field1></v1></source><model /><devicemodel /><subcircuit><x1><field>/home/fossee/esim-clones/eSim/src/SubcircuitLibrary/ua741</field></x1></subcircuit><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Differentiator/analysis b/Differentiator/analysis
index 660a46c..d5e1354 100644
--- a/Differentiator/analysis
+++ b/Differentiator/analysis
@@ -1 +1 @@
-.tran 10e-03 100e-03 0e-03
\ No newline at end of file
+.tran 10e-03 100e-03 0e-00
\ No newline at end of file
diff --git a/Differentiator/ua741_Previous_Values.xml b/Differentiator/ua741_Previous_Values.xml
deleted file mode 100644
index 9c7bb53..0000000
--- a/Differentiator/ua741_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source /><model /><devicemodel /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">False</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Diode_characteristics/Diode_characteristics.cir.out b/Diode_characteristics/Diode_characteristics.cir.out
index a8f2141..2a3da23 100644
--- a/Diode_characteristics/Diode_characteristics.cir.out
+++ b/Diode_characteristics/Diode_characteristics.cir.out
@@ -1,13 +1,10 @@
 * /home/fossee/esim-workspace/diode_characteristics/diode_characteristics.cir
 
-.include D.lib
 v1 in gnd  dc 1
-d1 in out 1N4148
+d1  in out d
 r1  net-_r1-pad1_ gnd 1k
 * u1  out net-_r1-pad1_ plot_i2
 v_u1 out net-_r1-pad1_ 0
-* Schematic Name: zener, NgSpice Name: zener
-.model u1 zener(n_forward=1.0 v_breakdown=5.6 i_sat=1.0e-12 limit_switch=FALSE i_breakdown=2.0e-2 ) 
 .dc v1 0e-00 1e-00 0.01e-00
 
 * Control Statements 
diff --git a/Diode_characteristics/Diode_characteristics_Previous_Values.xml b/Diode_characteristics/Diode_characteristics_Previous_Values.xml
deleted file mode 100644
index 351aa18..0000000
--- a/Diode_characteristics/Diode_characteristics_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">1</field1></v1><v_iout1 name="Source type">0</v_iout1><v_id1 name="Source type">0</v_id1><v_u1 name="Source type">0</v_u1></source><model /><devicemodel><d1><field>/home/fossee/eSim_Master/eSim/src/deviceModelLibrary/Diode/D.lib</field></d1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1">v1</field1><field2 name="Start">0</field2><field3 name="Increment">0.01</field3><field4 name="Stop">1</field4><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">1</field2><field3 name="Stop Time">10</field3><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/FET_Amplifier/FET_Amplifier.cir.out b/FET_Amplifier/FET_Amplifier.cir.out
index 83429c5..ce71d2d 100644
--- a/FET_Amplifier/FET_Amplifier.cir.out
+++ b/FET_Amplifier/FET_Amplifier.cir.out
@@ -1,10 +1,9 @@
 * /home/fossee/updatedexamples/fet_amplifier/fet_amplifier.cir
 
-.include NJF.lib
 c1  net-_c1-pad1_ in 1u
 c6  net-_c6-pad1_ gnd 0.1u
 v2 net-_r3-pad1_ gnd  dc 10
-j1 out net-_c1-pad1_ net-_c6-pad1_ J2N3819
+j1  out net-_c1-pad1_ net-_c6-pad1_ njf
 r3  net-_r3-pad1_ out 3k
 r2  gnd net-_c1-pad1_ 1meg
 r4  gnd net-_c6-pad1_ 470
diff --git a/FET_Amplifier/FET_Amplifier_Previous_Values.xml b/FET_Amplifier/FET_Amplifier_Previous_Values.xml
deleted file mode 100644
index d47bdfa..0000000
--- a/FET_Amplifier/FET_Amplifier_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v2 name="Source type">dc<field1 name="Value">10</field1></v2><v1 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">10m</field2><field3 name="Frequency">1k</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v1></source><model /><devicemodel><j1><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/JFET/NJF.lib</field></j1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">false</field1><field2 name="Dec">true</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">GHz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">10</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">us</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/FET_Characteristic/FET_Characteristic.cir.out b/FET_Characteristic/FET_Characteristic.cir.out
index 013d04f..7dfcdef 100644
--- a/FET_Characteristic/FET_Characteristic.cir.out
+++ b/FET_Characteristic/FET_Characteristic.cir.out
@@ -1,7 +1,6 @@
 * /home/fossee/updatedexamples/fet_characteristic/fet_characteristic.cir
 
-.include NJF.lib
-j1 id net-_j1-pad2_ gnd J2N3819
+j1  id net-_j1-pad2_ gnd njf
 vds1 net-_u_id1-pad1_ gnd  dc 10
 vgs1 net-_j1-pad2_ gnd  dc 0
 * u_id1  net-_u_id1-pad1_ id plot_i2
diff --git a/FET_Characteristic/FET_Characteristic_Previous_Values.xml b/FET_Characteristic/FET_Characteristic_Previous_Values.xml
deleted file mode 100644
index 591228d..0000000
--- a/FET_Characteristic/FET_Characteristic_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><vds1 name="Source type">dc<field1 name="Value">10</field1></vds1><vgs1 name="Source type">dc<field1 name="Value">0</field1></vgs1><v_id1 name="Source type">0</v_id1><v_u_id1 name="Source type">0</v_u_id1></source><model /><devicemodel><j1><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/JFET/NJF.lib</field></j1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1">vds1</field1><field2 name="Start">0</field2><field3 name="Increment">10</field3><field4 name="Stop">50</field4><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2">vgs1</field9><field10 name="Start">0</field10><field11 name="Increment">1</field11><field12 name="Stop">5</field12><field13 name="Start Combo">mV or mA</field13><field14 name="Increment Combo">mV or mA</field14><field15 name="Stop Combo">mV or mA</field15></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/FrequencyResponse_JFET/FrequencyResponse_JFET.cir.out b/FrequencyResponse_JFET/FrequencyResponse_JFET.cir.out
index 1b20a3b..2d5c50c 100644
--- a/FrequencyResponse_JFET/FrequencyResponse_JFET.cir.out
+++ b/FrequencyResponse_JFET/FrequencyResponse_JFET.cir.out
@@ -1,10 +1,9 @@
 * /home/fossee/updatedexamples/frequencyresponse_jfet/frequencyresponse_jfet.cir
 
-.include NJF.lib
 c1  net-_c1-pad1_ in 1u
 c6  net-_c6-pad1_ gnd 0.1u
 v2 net-_r3-pad1_ gnd  dc 20
-j1 out net-_c1-pad1_ net-_c6-pad1_ J2N3819
+j1  out net-_c1-pad1_ net-_c6-pad1_ njf
 r3  net-_r3-pad1_ out 3k
 r2  gnd net-_c1-pad1_ 1meg
 r4  gnd net-_c6-pad1_ 470
@@ -13,7 +12,7 @@ v1 in gnd  ac 0.1m 0
 * u3  out plot_log
 * u2  out plot_phase
 * u4  out plot_db
-.ac dec 100 10KHz 100Meg
+.ac dec 100 10KHz 100KHz
 
 * Control Statements 
 .control
diff --git a/FrequencyResponse_JFET/FrequencyResponse_JFET_Previous_Values.xml b/FrequencyResponse_JFET/FrequencyResponse_JFET_Previous_Values.xml
deleted file mode 100644
index c8ec5a1..0000000
--- a/FrequencyResponse_JFET/FrequencyResponse_JFET_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v2 name="Source type">dc<field1 name="Value">20</field1></v2><v1 name="Source type">ac<field1 name="Amplitude">0.1m</field1></v1></source><model /><devicemodel><j1><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/JFET/NJF.lib</field></j1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">false</field1><field2 name="Dec">true</field2><field3 name="Oct">false</field3><field4 name="Start Frequency">10</field4><field5 name="Stop Frequency">100</field5><field6 name="No. of points">100</field6><field7 name="Start Fre Combo">KHz</field7><field8 name="Stop Fre Combo">Meg</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/FrequencyResponse_JFET/analysis b/FrequencyResponse_JFET/analysis
index d7b67b4..4c48fa3 100644
--- a/FrequencyResponse_JFET/analysis
+++ b/FrequencyResponse_JFET/analysis
@@ -1 +1 @@
-.ac dec 100 10KHz 100Meg
\ No newline at end of file
+.ac dec 100 10KHz 100KHz
\ No newline at end of file
diff --git a/FullAdder/FullAdder_Previous_Values.xml b/FullAdder/FullAdder_Previous_Values.xml
deleted file mode 100644
index 3265600..0000000
--- a/FullAdder/FullAdder_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">5</field1></v1><v2 name="Source type">dc<field1 name="Value">0</field1></v2><v3 name="Source type">dc<field1 name="Value">5</field1></v3></source><model><u6 name="type">adc_bridge<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter value for in_high (default=2.0)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /><field4 name="Enter value for in_low (default=1.0)" /></u6><u7 name="type">dac_bridge<field5 name="Enter value for input load (default=1.0e-12)" /><field6 name="Enter value for out_low (default=0.0)" /><field7 name="Enter value for out_high (default=5.0)" /><field8 name="Enter the Rise Time (default=1.0e-9)" /><field9 name="Enter the Fall Time (default=1.0e-9)" /><field10 name="Enter value for out_undef (default=0.5)" /></u7></model><devicemodel /><subcircuit><x1><field>/home/fossee/esim-clones/eSim/src/SubcircuitLibrary/full_adder</field></x1></subcircuit><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/FullAdder/full_adder_Previous_Values.xml b/FullAdder/full_adder_Previous_Values.xml
deleted file mode 100644
index b63184d..0000000
--- a/FullAdder/full_adder_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">False</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis><source /><model><u2 name="type">d_or<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter Input Load (default=1.0e-12)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /></u2></model><devicemodel /></KicadtoNgspice>
\ No newline at end of file
diff --git a/FullAdder/half_adder_Previous_Values.xml b/FullAdder/half_adder_Previous_Values.xml
deleted file mode 100644
index b915f0d..0000000
--- a/FullAdder/half_adder_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">False</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis><source /><model><u2 name="type">d_xor<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter Input Load (default=1.0e-12)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /></u2><u3 name="type">d_and<field4 name="Enter Fall Delay (default=1.0e-9)" /><field5 name="Enter Input Load (default=1.0e-12)" /><field6 name="Enter Rise Delay (default=1.0e-9)" /></u3></model><devicemodel /></KicadtoNgspice>
\ No newline at end of file
diff --git a/FullwaveRectifier_SCR/FullwaveRectifier_SCR.cir.out b/FullwaveRectifier_SCR/FullwaveRectifier_SCR.cir.out
index 28938f4..95c5fbd 100644
--- a/FullwaveRectifier_SCR/FullwaveRectifier_SCR.cir.out
+++ b/FullwaveRectifier_SCR/FullwaveRectifier_SCR.cir.out
@@ -1,14 +1,13 @@
 * /home/fossee/updatedexamples/fullwaverectifier_scr/fullwaverectifier_scr.cir
 
 .include scr.sub
-.include PowerDiode.lib
 x1 gnd pulse out2 scr
 v1  in1 in2 sine(0 200 100 0 0)
 v2  pulse gnd pulse(0 5 2m 0 0 1m 5m)
-d1 in1 out1 PowerDiode
-d3 in2 out1 PowerDiode
-d2 gnd in1 PowerDiode
-d4 gnd in2 PowerDiode
+d1  in1 out1 d
+d3  in2 out1 d
+d2  gnd in1 d
+d4  gnd in2 d
 r1  out1 out2 100
 * u1  in1 in2 plot_v2
 * u3  pulse plot_v1
diff --git a/FullwaveRectifier_SCR/FullwaveRectifier_SCR_Previous_Values.xml b/FullwaveRectifier_SCR/FullwaveRectifier_SCR_Previous_Values.xml
deleted file mode 100644
index b16d4ef..0000000
--- a/FullwaveRectifier_SCR/FullwaveRectifier_SCR_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">20</field2><field3 name="Stop Time">20</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">us</field5><field6 name="Stop Combo">ms</field6></tran></analysis><source><v1 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">200</field2><field3 name="Frequency">100</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v1><v2 name="Source type">pulse<field1 name="Initial Value">0</field1><field2 name="Pulse Value">5</field2><field3 name="Delay Time">2m</field3><field4 name="Rise Time">0</field4><field5 name="Fall Time">0</field5><field5 name="Pulse width">1m</field5><field5 name="Period">5m</field5></v2></source><model /><devicemodel><d4><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/Diode/PowerDiode.lib</field></d4><d2><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/Diode/PowerDiode.lib</field></d2><d3><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/Diode/PowerDiode.lib</field></d3><d1><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/Diode/PowerDiode.lib</field></d1></devicemodel><subcircuit><x1><field>/home/fossee/esim-updated/eSim/src/SubcircuitLibrary/scr</field></x1></subcircuit></KicadtoNgspice>
\ No newline at end of file
diff --git a/FullwaveRectifier_SCR/scr_Previous_Values.xml b/FullwaveRectifier_SCR/scr_Previous_Values.xml
deleted file mode 100644
index 8ff6e8d..0000000
--- a/FullwaveRectifier_SCR/scr_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">0</field1></v1><v2 name="Source type">dc<field1 name="Value">0</field1></v2></source><model><u1 name="type">aswitch<field1 name="Enter Log (default=TRUE)" /><field2 name="Enter Control OFF value (default=0.0)" /><field3 name="Enter OFF Resistance (default=1.0e12)" /><field4 name="Enter ON Resistance (default=1.0)" /><field5 name="Enter Control ON value(default=1.0)" /></u1></model><devicemodel><d1><field>/opt/eSim/src/deviceModelLibrary/Diode/PowerDiode.lib</field></d1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">ps</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Fullwavebridgerectifier/Fullwavebridgerectifier.cir.out b/Fullwavebridgerectifier/Fullwavebridgerectifier.cir.out
index d3cc783..39bef1f 100644
--- a/Fullwavebridgerectifier/Fullwavebridgerectifier.cir.out
+++ b/Fullwavebridgerectifier/Fullwavebridgerectifier.cir.out
@@ -1,15 +1,14 @@
 * /home/fossee/updatedexamples/fullwavebridgerectifier/fullwavebridgerectifier.cir
 
-.include D.lib
 v1  in1 in2 sine(0 5 50 0 0)
-d1 in1 out 1N4148
-d3 in2 out 1N4148
-d2 gnd in1 1N4148
-d4 gnd in2 1N4148
+d1  in1 out d
+d3  in2 out d
+d2  gnd in1 d
+d4  gnd in2 d
 r1  out gnd 1k
 * u2  out plot_v1
 * u1  in1 in2 plot_v2
-.tran 10e-03 100e-03 0e-03
+.tran 10e-00 100e-00 0e-00
 
 * Control Statements 
 .control
diff --git a/Fullwavebridgerectifier/Fullwavebridgerectifier_Previous_Values.xml b/Fullwavebridgerectifier/Fullwavebridgerectifier_Previous_Values.xml
deleted file mode 100644
index 3369ba7..0000000
--- a/Fullwavebridgerectifier/Fullwavebridgerectifier_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">5</field2><field3 name="Frequency">50</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v1></source><model /><devicemodel><d4><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/Diode/D.lib</field></d4><d2><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/Diode/D.lib</field></d2><d3><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/Diode/D.lib</field></d3><d1><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/Diode/D.lib</field></d1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Fullwavebridgerectifier/analysis b/Fullwavebridgerectifier/analysis
index 660a46c..27cb823 100644
--- a/Fullwavebridgerectifier/analysis
+++ b/Fullwavebridgerectifier/analysis
@@ -1 +1 @@
-.tran 10e-03 100e-03 0e-03
\ No newline at end of file
+.tran 10e-00 100e-00 0e-00
\ No newline at end of file
diff --git a/Half_Adder/Half_Adder_Previous_Values.xml b/Half_Adder/Half_Adder_Previous_Values.xml
deleted file mode 100644
index ca48266..0000000
--- a/Half_Adder/Half_Adder_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">5</field1></v1><v2 name="Source type">dc<field1 name="Value">0</field1></v2></source><model><u1 name="type">adc_bridge<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter value for in_high (default=2.0)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /><field4 name="Enter value for in_low (default=1.0)" /></u1><u2 name="type">dac_bridge<field5 name="Enter value for input load (default=1.0e-12)" /><field6 name="Enter value for out_low (default=0.0)" /><field7 name="Enter value for out_high (default=5.0)" /><field8 name="Enter the Rise Time (default=1.0e-9)" /><field9 name="Enter the Fall Time (default=1.0e-9)" /><field10 name="Enter value for out_undef (default=0.5)" /></u2></model><devicemodel /><subcircuit><x1><field>/home/fossee/esim-updated/eSim/src/SubcircuitLibrary/half_adder</field></x1></subcircuit><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Half_Adder/half_adder_Previous_Values.xml b/Half_Adder/half_adder_Previous_Values.xml
deleted file mode 100644
index b915f0d..0000000
--- a/Half_Adder/half_adder_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">False</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis><source /><model><u2 name="type">d_xor<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter Input Load (default=1.0e-12)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /></u2><u3 name="type">d_and<field4 name="Enter Fall Delay (default=1.0e-9)" /><field5 name="Enter Input Load (default=1.0e-12)" /><field6 name="Enter Rise Delay (default=1.0e-9)" /></u3></model><devicemodel /></KicadtoNgspice>
\ No newline at end of file
diff --git a/HalfwaveRectifier_SCR/HalfwaveRectifier_SCR_Previous_Values.xml b/HalfwaveRectifier_SCR/HalfwaveRectifier_SCR_Previous_Values.xml
deleted file mode 100644
index 8b10950..0000000
--- a/HalfwaveRectifier_SCR/HalfwaveRectifier_SCR_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">40</field2><field3 name="Stop Time">40</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">us</field5><field6 name="Stop Combo">ms</field6></tran></analysis><source><v1 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">100</field2><field3 name="Frequency">50</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v1><v2 name="Source type">pulse<field1 name="Initial Value">0</field1><field2 name="Pulse Value">5</field2><field3 name="Delay Time">4m</field3><field4 name="Rise Time">0</field4><field5 name="Fall Time">0</field5><field5 name="Pulse width">1m</field5><field5 name="Period">20m</field5></v2></source><model /><devicemodel /><subcircuit><x1><field>/home/fossee/esim-updated/eSim/src/SubcircuitLibrary/scr</field></x1></subcircuit></KicadtoNgspice>
\ No newline at end of file
diff --git a/HalfwaveRectifier_SCR/scr_Previous_Values.xml b/HalfwaveRectifier_SCR/scr_Previous_Values.xml
deleted file mode 100644
index 8ff6e8d..0000000
--- a/HalfwaveRectifier_SCR/scr_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">0</field1></v1><v2 name="Source type">dc<field1 name="Value">0</field1></v2></source><model><u1 name="type">aswitch<field1 name="Enter Log (default=TRUE)" /><field2 name="Enter Control OFF value (default=0.0)" /><field3 name="Enter OFF Resistance (default=1.0e12)" /><field4 name="Enter ON Resistance (default=1.0)" /><field5 name="Enter Control ON value(default=1.0)" /></u1></model><devicemodel><d1><field>/opt/eSim/src/deviceModelLibrary/Diode/PowerDiode.lib</field></d1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">ps</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Halfwave_Rectifier/Halfwave_Rectifier.cir.out b/Halfwave_Rectifier/Halfwave_Rectifier.cir.out
index c9dbd10..11c2279 100644
--- a/Halfwave_Rectifier/Halfwave_Rectifier.cir.out
+++ b/Halfwave_Rectifier/Halfwave_Rectifier.cir.out
@@ -1,7 +1,6 @@
 * /home/fossee/updatedexamples/halfwave_rectifier/halfwave_rectifier.cir
 
-.include D.lib
-d1 in out 1N4148
+d1  in out d
 r1  out gnd 1k
 v1  in gnd sine(0 20 50 0 0)
 * u2  in plot_v1
diff --git a/Halfwave_Rectifier/Halfwave_Rectifier_Previous_Values.xml b/Halfwave_Rectifier/Halfwave_Rectifier_Previous_Values.xml
deleted file mode 100644
index a7332ab..0000000
--- a/Halfwave_Rectifier/Halfwave_Rectifier_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">20</field2><field3 name="Frequency">50</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v1></source><model><u1 name="type">transfo<field1 name="Enter the H1 array " /><field2 name="Enter the primary number of turns (default=310) ">100</field2><field3 name="Enter iron core area (default=1)" /><field4 name="Enter iron core length (default=0.01)" /><field5 name="Enter the secondary number of turns (default=620)">200</field5><field6 name="Enter the B1 array " /></u1></model><devicemodel><d1><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/Diode/D.lib</field></d1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/High_Pass_Filter/High_Pass_Filter_Previous_Values.xml b/High_Pass_Filter/High_Pass_Filter_Previous_Values.xml
deleted file mode 100644
index 1511741..0000000
--- a/High_Pass_Filter/High_Pass_Filter_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">ac<field1 name="Amplitude">10</field1><field2 name="Phase" /></v1></source><model /><devicemodel /><subcircuit /><analysis><ac><field1 name="Lin">false</field1><field2 name="Dec">true</field2><field3 name="Oct">false</field3><field4 name="Start Frequency">1</field4><field5 name="Stop Frequency">1</field5><field6 name="No. of points">20</field6><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Meg</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Integrator/Integrator.cir.out b/Integrator/Integrator.cir.out
index c327146..c7ac6e4 100644
--- a/Integrator/Integrator.cir.out
+++ b/Integrator/Integrator.cir.out
@@ -7,10 +7,10 @@ r2  net-_r2-pad1_ gnd 1k
 r3  out gnd 1k
 c1  out net-_c1-pad2_ 100n
 r4  net-_c1-pad2_ out 100k
-v1  in gnd pwl(0m 0 0.5m 5 25m 5 25.5m -5 50m -5 50.5m 5 75m 5 75.5m -5 100m -5)
+v1  in gnd pwl(0m 0 0.5m 5 50m 5 50.5m 0 100m 0)
 * u1  in plot_v1
 * u2  out plot_v1
-.tran 10e-03 100e-03 0e-03
+.tran 10e-00 100e-00 0e-00
 
 * Control Statements 
 .control
diff --git a/Integrator/Integrator_Previous_Values.xml b/Integrator/Integrator_Previous_Values.xml
deleted file mode 100644
index fa1b132..0000000
--- a/Integrator/Integrator_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">5</field2><field3 name="Frequency">50</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v1><v1 name="Source type">pulse<field1 name="Initial Value">0</field1><field2 name="Pulse Value">5</field2><field3 name="Delay Time">0</field3><field4 name="Rise Time">0.1u</field4><field5 name="Fall Time">0.1u</field5><field5 name="Pulse width">10u</field5><field5 name="Period">20u</field5></v1><v1 name="Source type">pwl<field1 name="Enter in pwl format">0m 0 0.5m 5 25m 5 25.5m -5 50m -5 50.5m 5 75m 5 75.5m -5 100m -5</field1></v1></source><model /><devicemodel /><subcircuit><x1><field>/home/fossee/esim-clones/eSim/src/SubcircuitLibrary/ua741</field></x1></subcircuit><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Integrator/analysis b/Integrator/analysis
index 660a46c..27cb823 100644
--- a/Integrator/analysis
+++ b/Integrator/analysis
@@ -1 +1 @@
-.tran 10e-03 100e-03 0e-03
\ No newline at end of file
+.tran 10e-00 100e-00 0e-00
\ No newline at end of file
diff --git a/Integrator/ua741_Previous_Values.xml b/Integrator/ua741_Previous_Values.xml
deleted file mode 100644
index 9c7bb53..0000000
--- a/Integrator/ua741_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source /><model /><devicemodel /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">False</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/InvertingAmplifier/InvertingAmplifier_Previous_Values.xml b/InvertingAmplifier/InvertingAmplifier_Previous_Values.xml
deleted file mode 100644
index 8c7b2d9..0000000
--- a/InvertingAmplifier/InvertingAmplifier_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">2</field2><field3 name="Frequency">50</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v1></source><model /><devicemodel /><subcircuit><x1><field>/home/fossee/esim-updated/eSim/src/SubcircuitLibrary/ua741</field></x1></subcircuit><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/InvertingAmplifier/ua741_Previous_Values.xml b/InvertingAmplifier/ua741_Previous_Values.xml
deleted file mode 100644
index 9c7bb53..0000000
--- a/InvertingAmplifier/ua741_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source /><model /><devicemodel /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">False</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/JK_Flipflop/JK_Flipflop_Previous_Values.xml b/JK_Flipflop/JK_Flipflop_Previous_Values.xml
deleted file mode 100644
index 120edca..0000000
--- a/JK_Flipflop/JK_Flipflop_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis><source><v1 name="Source type">dc<field1 name="Value">5</field1></v1><v3 name="Source type">dc<field1 name="Value">0</field1></v3><v4 name="Source type">0</v4><v5 name="Source type">0</v5><v2 name="Source type">pulse<field1 name="Initial Value">0</field1><field2 name="Pulse Value">5</field2><field3 name="Delay Time">1m</field3><field4 name="Rise Time">1m</field4><field5 name="Fall Time">1m</field5><field5 name="Pulse width">20</field5><field5 name="Period">40</field5></v2></source><model><u6 name="type">adc_bridge<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter value for in_high (default=2.0)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /><field4 name="Enter value for in_low (default=1.0)" /></u6><u7 name="type">dac_bridge<field5 name="Enter value for input load (default=1.0e-12)" /><field6 name="Enter value for out_low (default=0.0)" /><field7 name="Enter value for out_high (default=5.0)" /><field8 name="Enter the Rise Time (default=1.0e-9)" /><field9 name="Enter the Fall Time (default=1.0e-9)" /><field10 name="Enter value for out_undef (default=0.5)" /></u7><u9 name="type">d_jkff<field11 name="Enter IC (default=0)" /><field12 name="Enter Fall Delay (default=1.0e-9)" /><field13 name="Enter Set Delay (default=1.0e-9)" /><field14 name="Enter value for Set Load (default=1.0e-12)" /><field15 name="Enter Clk Delay (default=1.0e-9)" /><field16 name="Enter value for Clk Load (default=1.0e-12)" /><field17 name="Enter Reset Delay (default=1.0)" /><field18 name="Enter Rise Delay (default=1.0e-9)" /><field19 name="Enter value for JK Load (default=1.0e-12)" /><field20 name="Enter value for Reset Load (default=1.0e-12)" /></u9><u8 name="type">adc_bridge<field21 name="Enter Fall Delay (default=1.0e-9)" /><field22 name="Enter value for in_high (default=2.0)" /><field23 name="Enter Rise Delay (default=1.0e-9)" /><field24 name="Enter value for in_low (default=1.0)" /></u8><u10 name="type">adc_bridge<field25 name="Enter Fall Delay (default=1.0e-9)" /><field26 name="Enter value for in_high (default=2.0)" /><field27 name="Enter Rise Delay (default=1.0e-9)" /><field28 name="Enter value for in_low (default=1.0)" /></u10></model><devicemodel /><subcircuit /></KicadtoNgspice>
\ No newline at end of file
diff --git a/Low_Pass_Filter/Low_Pass_Filter_Previous_Values.xml b/Low_Pass_Filter/Low_Pass_Filter_Previous_Values.xml
deleted file mode 100644
index 56bfaf1..0000000
--- a/Low_Pass_Filter/Low_Pass_Filter_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">ac<field1 name="Amplitude">10</field1><field2 name="Phase" /></v1></source><model /><devicemodel /><subcircuit /><analysis><ac><field1 name="Lin">false</field1><field2 name="Dec">true</field2><field3 name="Oct">false</field3><field4 name="Start Frequency">1</field4><field5 name="Stop Frequency">100</field5><field6 name="No. of points">20</field6><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">KHz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Parallel_Resonance/Parallel_Resonance_Previous_Values.xml b/Parallel_Resonance/Parallel_Resonance_Previous_Values.xml
deleted file mode 100644
index 9a5ac67..0000000
--- a/Parallel_Resonance/Parallel_Resonance_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">ac<field1 name="Amplitude">1</field1><field2 name="Phase" /></v1></source><model /><devicemodel /><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency">1</field4><field5 name="Stop Frequency">700</field5><field6 name="No. of points">20</field6><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/RC/RC.cir.out b/RC/RC.cir.out
index f504689..e622511 100644
--- a/RC/RC.cir.out
+++ b/RC/RC.cir.out
@@ -5,7 +5,7 @@ c1  out gnd 10u
 v1  in gnd pwl(0m 0 0.5m 5 50m 5 50.5m 0 100m 0)
 * u1  in plot_v1
 * u2  out plot_v1
-.tran 10e-03 100e-03 0e-03
+.tran 10e-00 100e-00 0e-00
 
 * Control Statements 
 .control
diff --git a/RC/RC_Previous_Values.xml b/RC/RC_Previous_Values.xml
deleted file mode 100644
index 999b881..0000000
--- a/RC/RC_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">pwl<field1 name="Enter in pwl format">0m 0 0.5m 5 50m 5 50.5m 0 100m 0</field1></v1></source><model /><devicemodel /><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/RC/analysis b/RC/analysis
index 660a46c..27cb823 100644
--- a/RC/analysis
+++ b/RC/analysis
@@ -1 +1 @@
-.tran 10e-03 100e-03 0e-03
\ No newline at end of file
+.tran 10e-00 100e-00 0e-00
\ No newline at end of file
diff --git a/RL/RL.cir.out b/RL/RL.cir.out
index 8e08d27..562445d 100644
--- a/RL/RL.cir.out
+++ b/RL/RL.cir.out
@@ -5,7 +5,7 @@ l1  out gnd 100m
 v1  in gnd pwl(0m 0 0.5m 5 50m 5 50.5m 0 100m 0)
 * u1  in plot_v1
 * u2  out plot_v1
-.tran 10e-03 100e-03 0e-03
+.tran 10e-00 100e-00 0e-00
 
 * Control Statements 
 .control
diff --git a/RL/RL_Previous_Values.xml b/RL/RL_Previous_Values.xml
deleted file mode 100644
index 5388a5a..0000000
--- a/RL/RL_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">pwl<field1 name="Enter in pwl format">0m 0 0.5m 5 50m 5 50.5m 0 100m 0</field1></v1><v2 name="Source type">0</v2><v3 name="Source type">0</v3></source><model /><devicemodel /><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/RL/analysis b/RL/analysis
index 660a46c..27cb823 100644
--- a/RL/analysis
+++ b/RL/analysis
@@ -1 +1 @@
-.tran 10e-03 100e-03 0e-03
\ No newline at end of file
+.tran 10e-00 100e-00 0e-00
\ No newline at end of file
diff --git a/RLC/RLC.cir.out b/RLC/RLC.cir.out
index 6498043..8a38354 100644
--- a/RLC/RLC.cir.out
+++ b/RLC/RLC.cir.out
@@ -3,10 +3,10 @@
 r1  in net-_l1-pad1_ 1k
 l1  net-_l1-pad1_ out 2
 c1  out gnd 0.5u
-v1  in gnd pwl(0m 0 0.5m 5)
+v1  in gnd pwl(0m 0 0.5m 5 50m 5 50.5m 0 100m 0)
 * u1  in plot_v1
 * u2  out plot_v1
-.tran 10e-03 100e-03 0e-03
+.tran 10e-00 100e-00 0e-00
 
 * Control Statements 
 .control
diff --git a/RLC/RLC_Previous_Values.xml b/RLC/RLC_Previous_Values.xml
deleted file mode 100644
index 6c2cb3c..0000000
--- a/RLC/RLC_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">10</field1></v1><v1 name="Source type">pwl<field1 name="Enter in pwl format">0m 0 0.5m 5</field1></v1></source><model /><devicemodel /><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/RLC/analysis b/RLC/analysis
index 660a46c..27cb823 100644
--- a/RLC/analysis
+++ b/RLC/analysis
@@ -1 +1 @@
-.tran 10e-03 100e-03 0e-03
\ No newline at end of file
+.tran 10e-00 100e-00 0e-00
\ No newline at end of file
diff --git a/Series_Resonance/Series_Resonance_Previous_Values.xml b/Series_Resonance/Series_Resonance_Previous_Values.xml
deleted file mode 100644
index 6bd3fff..0000000
--- a/Series_Resonance/Series_Resonance_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">ac<field1 name="Amplitude">1</field1><field2 name="Phase" /></v1></source><model /><devicemodel /><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency">1</field4><field5 name="Stop Frequency">250</field5><field6 name="No. of points">20</field6><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Transformer/Transformer_Previous_Values.xml b/Transformer/Transformer_Previous_Values.xml
deleted file mode 100644
index e03a69b..0000000
--- a/Transformer/Transformer_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis><source><v1 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">10</field2><field3 name="Frequency">50</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v1></source><model><u1 name="type">transfo<field1 name="Enter the H1 array " /><field2 name="Enter the primary number of turns (default=310) " /><field3 name="Enter iron core area (default=1)" /><field4 name="Enter iron core length (default=0.01)" /><field5 name="Enter the secondary number of turns (default=620)" /><field6 name="Enter the B1 array " /></u1></model><devicemodel /><subcircuit /></KicadtoNgspice>
\ No newline at end of file
diff --git a/Zener_Characteristic/Zener_Characteristic_Previous_Values.xml b/Zener_Characteristic/Zener_Characteristic_Previous_Values.xml
deleted file mode 100644
index 4acc881..0000000
--- a/Zener_Characteristic/Zener_Characteristic_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">10</field1></v1><v_u2 name="Source type">0</v_u2></source><model><u1 name="type">zener<field1 name="Enter Saturation Current (default=1.0e-12)" /><field2 name="Enter Forward Emission Coefficient (default=1.0)" /><field3 name="Enter Breakdown Voltage (default=5.6)" /><field4 name="Enter Breakdown Current (default=2.0e-2)" /><field5 name="Enter Switch for Limiting (default=FALSE)" /></u1></model><devicemodel /><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1">v1</field1><field2 name="Start">0</field2><field3 name="Increment">0.05</field3><field4 name="Stop">8</field4><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/oscillator/oscillator_Previous_Values.xml b/oscillator/oscillator_Previous_Values.xml
deleted file mode 100644
index 98202b2..0000000
--- a/oscillator/oscillator_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">22</field1></v1></source><model /><devicemodel><q1><field>/home/fossee/esim-updated/eSim/src/deviceModelLibrary/Transistor/NPN.lib</field></q1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">1</field1><field2 name="Step Time">100</field2><field3 name="Stop Time">5</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">us</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file