ujt and ua741 sub files cleanup

18 files changed, 1161 insertions, 1742 deletions

diff --git a/Examples/Integrator/Integrator.pro b/Examples/Integrator/Integrator.pro
index 0212d2f0..0922f7b5 100644
--- a/Examples/Integrator/Integrator.pro
+++ b/Examples/Integrator/Integrator.pro
@@ -1,4 +1,4 @@
-update=Thu Feb 28 14:39:25 2019
+update=Wed Mar 18 18:52:14 2020
 version=1
 last_client=eeschema
 [general]
@@ -31,42 +31,39 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
-LibName1=Integrator-rescue
-LibName2=eSim_Analog
-LibName3=eSim_Devices
-LibName4=eSim_Digital
-LibName5=eSim_Hybrid
-LibName6=eSim_Miscellaneous
-LibName7=eSim_Plot
-LibName8=eSim_Power
-LibName9=eSim_Sources
-LibName10=eSim_Subckt
-LibName11=eSim_User
-LibName12=adc-dac
-LibName13=memory
-LibName14=xilinx
-LibName15=microcontrollers
-LibName16=dsp
-LibName17=microchip
-LibName18=analog_switches
-LibName19=motorola
-LibName20=texas
-LibName21=intel
-LibName22=audio
-LibName23=interface
-LibName24=digital-audio
-LibName25=philips
-LibName26=display
-LibName27=cypress
-LibName28=siliconi
-LibName29=opto
-LibName30=atmel
-LibName31=contrib
-LibName32=power
-LibName33=device
-LibName34=transistors
-LibName35=conn
-LibName36=linear
-LibName37=regul
-LibName38=74xx
-LibName39=cmos4000
+LibName1=eSim_Analog
+LibName2=eSim_Devices
+LibName3=eSim_Digital
+LibName4=eSim_Hybrid
+LibName5=eSim_Miscellaneous
+LibName6=eSim_Plot
+LibName7=eSim_Power
+LibName8=eSim_Sources
+LibName9=eSim_Subckt
+LibName10=eSim_User
+LibName11=adc-dac
+LibName12=memory
+LibName13=xilinx
+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=power
+LibName32=transistors
+LibName33=conn
+LibName34=regul
+LibName35=74xx
+LibName36=cmos4000
diff --git a/Examples/Integrator/ua741.pro b/Examples/Integrator/ua741.pro
index 5dbb81a5..c7b1d67b 100644
--- a/Examples/Integrator/ua741.pro
+++ b/Examples/Integrator/ua741.pro
@@ -1,72 +1,17 @@
-update=Monday 17 December 2012 06:14:06 PM IST
+update=Wed Mar 18 14:21:29 2020
 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=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=converterSpice
-LibName33=digitalSpice
-LibName34=linearSpice
-LibName35=measurementSpice
-LibName36=portSpice
-LibName37=sourcesSpice
-LibName38=analogXSpice
+LibName2=eSim_Devices
+LibName3=eSim_User
+LibName4=eSim_Subckt
+LibName5=eSim_Sources
+LibName6=eSim_Power
+LibName7=eSim_Plot
+LibName8=eSim_Miscellaneous
+LibName9=eSim_Hybrid
+LibName10=eSim_Digital
+LibName11=eSim_Analog
diff --git a/Examples/Integrator/ua741.sch b/Examples/Integrator/ua741.sch
index 7dfc5e1a..b06dcc17 100644
--- a/Examples/Integrator/ua741.sch
+++ b/Examples/Integrator/ua741.sch
@@ -1,46 +1,18 @@
-EESchema Schematic File Version 2  date Wednesday 19 December 2012 10:15:16 AM IST
+EESchema Schematic File Version 2
 LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:analogSpice
-LIBS:converterSpice
-LIBS:digitalSpice
-LIBS:linearSpice
-LIBS:measurementSpice
-LIBS:portSpice
-LIBS:sourcesSpice
-LIBS:analogXSpice
-LIBS:ua741-cache
-EELAYER 25  0
+LIBS:eSim_Devices
+LIBS:eSim_User
+LIBS:eSim_Subckt
+LIBS:eSim_Sources
+LIBS:eSim_Power
+LIBS:eSim_Plot
+LIBS:eSim_Miscellaneous
+LIBS:eSim_Hybrid
+LIBS:eSim_Digital
+LIBS:eSim_Analog
+EELAYER 25 0
 EELAYER END
-$Descr A4 11700 8267
+$Descr A4 11693 8268
 encoding utf-8
 Sheet 1 1
 Title ""
@@ -68,6 +40,8 @@ U 6 1 5082C027
 P 6250 2500
 F 0 "U1" H 6250 2450 30  0000 C CNN
 F 1 "PORT" H 6250 2500 30  0000 C CNN
+F 2 "" H 6250 2500 60  0001 C CNN
+F 3 "" H 6250 2500 60  0001 C CNN
 	6    6250 2500
 	-1   0    0    1   
 $EndComp
@@ -77,6 +51,8 @@ U 2 1 5082C011
 P 2300 3100
 F 0 "U1" H 2300 3050 30  0000 C CNN
 F 1 "PORT" H 2300 3100 30  0000 C CNN
+F 2 "" H 2300 3100 60  0001 C CNN
+F 3 "" H 2300 3100 60  0001 C CNN
 	2    2300 3100
 	1    0    0    -1  
 $EndComp
@@ -86,9 +62,57 @@ U 3 1 5082C00B
 P 2250 2600
 F 0 "U1" H 2250 2550 30  0000 C CNN
 F 1 "PORT" H 2250 2600 30  0000 C CNN
+F 2 "" H 2250 2600 60  0001 C CNN
+F 3 "" H 2250 2600 60  0001 C CNN
 	3    2250 2600
 	1    0    0    -1  
 $EndComp
+$Comp
+L PWR_FLAG #FLG1
+U 1 1 508152A0
+P 3450 3200
+F 0 "#FLG1" H 3450 3470 30  0001 C CNN
+F 1 "PWR_FLAG" H 3450 3430 30  0000 C CNN
+F 2 "" H 3450 3200 60  0001 C CNN
+F 3 "" H 3450 3200 60  0001 C CNN
+	1    3450 3200
+	1    0    0    -1  
+$EndComp
+$Comp
+L VCVS Eout1
+U 1 1 50813F0F
+P 5200 2900
+F 0 "Eout1" H 5000 3000 50  0000 C CNN
+F 1 "1" H 5000 2850 50  0000 C CNN
+F 2 "" H 5200 2900 60  0001 C CNN
+F 3 "" H 5200 2900 60  0001 C CNN
+	1    5200 2900
+	0    1    1    0   
+$EndComp
+$Comp
+L GND #PWR1
+U 1 1 50813E0D
+P 3700 3400
+F 0 "#PWR1" H 3700 3400 30  0001 C CNN
+F 1 "GND" H 3700 3330 30  0001 C CNN
+F 2 "" H 3700 3400 60  0001 C CNN
+F 3 "" H 3700 3400 60  0001 C CNN
+	1    3700 3400
+	1    0    0    -1  
+$EndComp
+$Comp
+L VCVS Ein1
+U 1 1 50813D7C
+P 3650 2850
+F 0 "Ein1" H 3450 2950 50  0000 C CNN
+F 1 "100e3" H 3450 2800 50  0000 C CNN
+F 2 "" H 3650 2850 60  0001 C CNN
+F 3 "" H 3650 2850 60  0001 C CNN
+	1    3650 2850
+	0    1    1    0   
+$EndComp
+Text Notes 2600 2900 0    60   ~ 0
+2e6\n
 Connection ~ 3700 3200
 Wire Wire Line
 	3450 3200 3700 3200
@@ -102,7 +126,7 @@ Wire Wire Line
 	5000 3300 5000 2950
 Connection ~ 3700 3300
 Wire Wire Line
-	4550 3300 4550 3100
+	4550 3000 4550 3300
 Wire Wire Line
 	3900 2500 3700 2500
 Wire Wire Line
@@ -141,79 +165,65 @@ Connection ~ 4550 2500
 Wire Wire Line
 	5250 2600 5250 2500
 Wire Wire Line
-	5250 2500 5350 2500
+	5250 2500 5400 2500
 Wire Wire Line
-	5850 2500 6000 2500
+	5700 2500 6000 2500
 $Comp
-L PWR_FLAG #FLG01
-U 1 1 508152A0
-P 3450 3200
-F 0 "#FLG01" H 3450 3470 30  0001 C CNN
-F 1 "PWR_FLAG" H 3450 3430 30  0000 C CNN
-	1    3450 3200
-	1    0    0    -1  
-$EndComp
-$Comp
-L R Rout1
-U 1 1 50813F5B
-P 5600 2500
-F 0 "Rout1" V 5680 2500 50  0000 C CNN
-F 1 "75" V 5600 2500 50  0000 C CNN
-	1    5600 2500
-	0    1    1    0   
-$EndComp
-$Comp
-L VCVS Eout1
-U 1 1 50813F0F
-P 5200 2900
-F 0 "Eout1" H 5000 3000 50  0000 C CNN
-F 1 "1" H 5000 2850 50  0000 C CNN
-	1    5200 2900
+L resistor Rin1
+U 1 1 5E71E232
+P 2950 2900
+F 0 "Rin1" H 3000 3030 50  0000 C CNN
+F 1 "2e6" H 3000 2850 50  0000 C CNN
+F 2 "" H 3000 2880 30  0000 C CNN
+F 3 "" V 3000 2950 30  0000 C CNN
+	1    2950 2900
 	0    1    1    0   
 $EndComp
+Wire Wire Line
+	3000 2600 3000 2800
 $Comp
-L C Cbw1
-U 1 1 50813EE0
-P 4550 2900
-F 0 "Cbw1" H 4600 3000 50  0000 L CNN
-F 1 "31.85e-9" H 4600 2800 50  0000 L CNN
-	1    4550 2900
+L resistor Rbw1
+U 1 1 5E71E326
+P 4050 2100
+F 0 "Rbw1" H 4100 2230 50  0000 C CNN
+F 1 "0.5e6" H 4100 2050 50  0000 C CNN
+F 2 "" H 4100 2080 30  0000 C CNN
+F 3 "" V 4100 2150 30  0000 C CNN
+	1    4050 2100
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	3900 2500 3900 2050
+Wire Wire Line
+	3900 2050 3950 2050
+Wire Wire Line
+	4250 2050 4400 2050
+Wire Wire Line
+	4400 2050 4400 2500
 $Comp
-L R Rbw1
-U 1 1 50813EAB
-P 4150 2500
-F 0 "Rbw1" V 4230 2500 50  0000 C CNN
-F 1 "0.5e6" V 4150 2500 50  0000 C CNN
-	1    4150 2500
-	0    1    1    0   
-$EndComp
-$Comp
-L GND #PWR02
-U 1 1 50813E0D
-P 3700 3400
-F 0 "#PWR02" H 3700 3400 30  0001 C CNN
-F 1 "GND" H 3700 3330 30  0001 C CNN
-	1    3700 3400
+L capacitor Cbw1
+U 1 1 5E71E45C
+P 4550 2850
+F 0 "Cbw1" H 4575 2950 50  0000 L CNN
+F 1 "31.85e-9" H 4575 2750 50  0000 L CNN
+F 2 "" H 4588 2700 30  0000 C CNN
+F 3 "" H 4550 2850 60  0000 C CNN
+	1    4550 2850
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCVS Ein1
-U 1 1 50813D7C
-P 3650 2850
-F 0 "Ein1" H 3450 2950 50  0000 C CNN
-F 1 "100e3" H 3450 2800 50  0000 C CNN
-	1    3650 2850
-	0    1    1    0   
-$EndComp
-$Comp
-L R Rin1
-U 1 1 50813C57
-P 3000 2850
-F 0 "Rin1" V 3080 2850 50  0000 C CNN
-F 1 "2e6" V 3000 2850 50  0000 C CNN
-	1    3000 2850
+L resistor Rout1
+U 1 1 5E71E59C
+P 5500 2250
+F 0 "Rout1" H 5550 2380 50  0000 C CNN
+F 1 "75" H 5550 2200 50  0000 C CNN
+F 2 "" H 5550 2230 30  0000 C CNN
+F 3 "" V 5550 2300 30  0000 C CNN
+	1    5500 2250
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	5400 2500 5400 2200
+Wire Wire Line
+	5700 2200 5700 2500
 $EndSCHEMATC
diff --git a/Examples/Integrator_LM_741/lm_741-cache.lib b/Examples/Integrator_LM_741/lm_741-cache.lib
index 6e908886..32e31aa1 100644
--- a/Examples/Integrator_LM_741/lm_741-cache.lib
+++ b/Examples/Integrator_LM_741/lm_741-cache.lib
@@ -1,119 +1,120 @@
-EESchema-LIBRARY Version 2.3

-#encoding utf-8

-#

-# PORT

-#

-DEF PORT U 0 40 Y Y 26 F N

-F0 "U" 50 100 30 H V C CNN

-F1 "PORT" 0 0 30 H V C CNN

-F2 "" 0 0 60 H V C CNN

-F3 "" 0 0 60 H V C CNN

-DRAW

-A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0

-A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50

-S -100 50 100 -50 0 1 0 N

-X ~ 1 250 0 100 L 30 30 1 1 B

-X ~ 2 250 0 100 L 30 30 2 1 B

-X ~ 3 250 0 100 L 30 30 3 1 B

-X ~ 4 250 0 100 L 30 30 4 1 B

-X ~ 5 250 0 100 L 30 30 5 1 B

-X ~ 6 250 0 100 L 30 30 6 1 B

-X ~ 7 250 0 100 L 30 30 7 1 B

-X ~ 8 250 0 100 L 30 30 8 1 B

-X ~ 9 250 0 100 L 30 30 9 1 B

-X ~ 10 250 0 100 L 30 30 10 1 B

-X ~ 11 250 0 100 L 30 30 11 1 B

-X ~ 12 250 0 100 L 30 30 12 1 B

-X ~ 13 250 0 100 L 30 30 13 1 B

-X ~ 14 250 0 100 L 30 30 14 1 B

-X ~ 15 250 0 100 L 30 30 15 1 B

-X ~ 16 250 0 100 L 30 30 16 1 B

-X ~ 17 250 0 100 L 30 30 17 1 B

-X ~ 18 250 0 100 L 30 30 18 1 B

-X ~ 19 250 0 100 L 30 30 19 1 B

-X ~ 20 250 0 100 L 30 30 20 1 B

-X ~ 21 250 0 100 L 30 30 21 1 B

-X ~ 22 250 0 100 L 30 30 22 1 B

-X ~ 23 250 0 100 L 30 30 23 1 B

-X ~ 24 250 0 100 L 30 30 24 1 B

-X ~ 25 250 0 100 L 30 30 25 1 B

-X ~ 26 250 0 100 L 30 30 26 1 B

-ENDDRAW

-ENDDEF

-#

-# eSim_C

-#

-DEF eSim_C C 0 10 N Y 1 F N

-F0 "C" 25 100 50 H V L CNN

-F1 "eSim_C" 25 -100 50 H V L CNN

-F2 "" 38 -150 30 H V C CNN

-F3 "" 0 0 60 H V C CNN

-$FPLIST

- C_*

-$ENDFPLIST

-DRAW

-P 2 0 1 20  -80 -30  80 -30 N

-P 2 0 1 20  -80 30  80 30 N

-X ~ 1 0 150 110 D 40 40 1 1 P

-X ~ 2 0 -150 110 U 40 40 1 1 P

-ENDDRAW

-ENDDEF

-#

-# eSim_NPN

-#

-DEF eSim_NPN Q 0 0 Y N 1 F N

-F0 "Q" -100 50 50 H V R CNN

-F1 "eSim_NPN" -50 150 50 H V R CNN

-F2 "" 200 100 29 H V C CNN

-F3 "" 0 0 60 H V C CNN

-ALIAS BC547 Q2N2222

-DRAW

-C 50 0 111 0 1 10 N

-P 2 0 1 0  25 25  100 100 N

-P 3 0 1 0  25 -25  100 -100  100 -100 N

-P 3 0 1 20  25 75  25 -75  25 -75 N

-P 5 0 1 0  50 -70  70 -50  90 -90  50 -70  50 -70 F

-X C 1 100 200 100 D 50 50 1 1 C

-X B 2 -200 0 225 R 50 50 1 1 I

-X E 3 100 -200 100 U 50 50 1 1 E

-ENDDRAW

-ENDDEF

-#

-# eSim_PNP

-#

-DEF eSim_PNP Q 0 0 Y N 1 F N

-F0 "Q" -100 50 50 H V R CNN

-F1 "eSim_PNP" -50 150 50 H V R CNN

-F2 "" 200 100 29 H V C CNN

-F3 "" 0 0 60 H V C CNN

-DRAW

-C 50 0 111 0 1 10 N

-P 2 0 1 0  25 25  100 100 N

-P 3 0 1 0  25 -25  100 -100  100 -100 N

-P 3 0 1 20  25 75  25 -75  25 -75 N

-P 5 0 1 0  90 -70  70 -90  50 -50  90 -70  90 -70 F

-X C 1 100 200 100 D 50 50 1 1 C

-X B 2 -200 0 225 R 50 50 1 1 I

-X E 3 100 -200 100 U 50 50 1 1 E

-ENDDRAW

-ENDDEF

-#

-# eSim_R

-#

-DEF eSim_R R 0 0 N Y 1 F N

-F0 "R" 50 130 50 H V C CNN

-F1 "eSim_R" 50 50 50 H V C CNN

-F2 "" 50 -20 30 H V C CNN

-F3 "" 50 50 30 V V C CNN

-$FPLIST

- R_*

- Resistor_*

-$ENDFPLIST

-DRAW

-S 150 10 -50 90 0 1 10 N

-X ~ 1 -100 50 50 R 60 60 1 1 P

-X ~ 2 200 50 50 L 60 60 1 1 P

-ENDDRAW

-ENDDEF

-#

-#End Library

+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# PORT
+#
+DEF PORT U 0 40 Y Y 26 F N
+F0 "U" 50 100 30 H V C CNN
+F1 "PORT" 0 0 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
+A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
+S -100 50 100 -50 0 1 0 N
+X ~ 1 250 0 100 L 30 30 1 1 B
+X ~ 2 250 0 100 L 30 30 2 1 B
+X ~ 3 250 0 100 L 30 30 3 1 B
+X ~ 4 250 0 100 L 30 30 4 1 B
+X ~ 5 250 0 100 L 30 30 5 1 B
+X ~ 6 250 0 100 L 30 30 6 1 B
+X ~ 7 250 0 100 L 30 30 7 1 B
+X ~ 8 250 0 100 L 30 30 8 1 B
+X ~ 9 250 0 100 L 30 30 9 1 B
+X ~ 10 250 0 100 L 30 30 10 1 B
+X ~ 11 250 0 100 L 30 30 11 1 B
+X ~ 12 250 0 100 L 30 30 12 1 B
+X ~ 13 250 0 100 L 30 30 13 1 B
+X ~ 14 250 0 100 L 30 30 14 1 B
+X ~ 15 250 0 100 L 30 30 15 1 B
+X ~ 16 250 0 100 L 30 30 16 1 B
+X ~ 17 250 0 100 L 30 30 17 1 B
+X ~ 18 250 0 100 L 30 30 18 1 B
+X ~ 19 250 0 100 L 30 30 19 1 B
+X ~ 20 250 0 100 L 30 30 20 1 B
+X ~ 21 250 0 100 L 30 30 21 1 B
+X ~ 22 250 0 100 L 30 30 22 1 B
+X ~ 23 250 0 100 L 30 30 23 1 B
+X ~ 24 250 0 100 L 30 30 24 1 B
+X ~ 25 250 0 100 L 30 30 25 1 B
+X ~ 26 250 0 100 L 30 30 26 1 B
+ENDDRAW
+ENDDEF
+#
+# eSim_C
+#
+DEF eSim_C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "eSim_C" 25 -100 50 H V L CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS capacitor
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 40 40 1 1 P
+X ~ 2 0 -150 110 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# eSim_NPN-RESCUE-lm_741
+#
+DEF eSim_NPN-RESCUE-lm_741 Q 0 0 Y N 1 F N
+F0 "Q" -100 50 50 H V R CNN
+F1 "eSim_NPN-RESCUE-lm_741" -50 150 50 H V R CNN
+F2 "" 200 100 29 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
+X C 1 100 200 100 D 50 50 1 1 C
+X B 2 -200 0 225 R 50 50 1 1 I
+X E 3 100 -200 100 U 50 50 1 1 E
+ENDDRAW
+ENDDEF
+#
+# eSim_PNP-RESCUE-lm_741
+#
+DEF eSim_PNP-RESCUE-lm_741 Q 0 0 Y N 1 F N
+F0 "Q" -100 50 50 H V R CNN
+F1 "eSim_PNP-RESCUE-lm_741" -50 150 50 H V R CNN
+F2 "" 200 100 29 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
+X C 1 100 200 100 D 50 50 1 1 C
+X B 2 -200 0 225 R 50 50 1 1 I
+X E 3 100 -200 100 U 50 50 1 1 E
+ENDDRAW
+ENDDEF
+#
+# eSim_R
+#
+DEF eSim_R R 0 0 N Y 1 F N
+F0 "R" 50 130 50 H V C CNN
+F1 "eSim_R" 50 -50 50 H V C CNN
+F2 "" 50 -20 30 H V C CNN
+F3 "" 50 50 30 V V C CNN
+ALIAS resistor
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S 150 10 -50 90 0 1 10 N
+X ~ 1 -100 50 50 R 60 60 1 1 P
+X ~ 2 200 50 50 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Examples/Integrator_LM_741/lm_741-rescue.lib b/Examples/Integrator_LM_741/lm_741-rescue.lib
new file mode 100644
index 00000000..1ac4cbd4
--- /dev/null
+++ b/Examples/Integrator_LM_741/lm_741-rescue.lib
@@ -0,0 +1,42 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# eSim_NPN-RESCUE-lm_741
+#
+DEF eSim_NPN-RESCUE-lm_741 Q 0 0 Y N 1 F N
+F0 "Q" -100 50 50 H V R CNN
+F1 "eSim_NPN-RESCUE-lm_741" -50 150 50 H V R CNN
+F2 "" 200 100 29 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
+X C 1 100 200 100 D 50 50 1 1 C
+X B 2 -200 0 225 R 50 50 1 1 I
+X E 3 100 -200 100 U 50 50 1 1 E
+ENDDRAW
+ENDDEF
+#
+# eSim_PNP-RESCUE-lm_741
+#
+DEF eSim_PNP-RESCUE-lm_741 Q 0 0 Y N 1 F N
+F0 "Q" -100 50 50 H V R CNN
+F1 "eSim_PNP-RESCUE-lm_741" -50 150 50 H V R CNN
+F2 "" 200 100 29 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
+X C 1 100 200 100 D 50 50 1 1 C
+X B 2 -200 0 225 R 50 50 1 1 I
+X E 3 100 -200 100 U 50 50 1 1 E
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Examples/Integrator_LM_741/lm_741.pro b/Examples/Integrator_LM_741/lm_741.pro
index cbe83f35..c0e871f8 100644
--- a/Examples/Integrator_LM_741/lm_741.pro
+++ b/Examples/Integrator_LM_741/lm_741.pro
@@ -1,4 +1,4 @@
-update=Fri Jun  7 21:53:51 2019
+update=Wed Mar 18 18:55:33 2020
 version=1
 last_client=eeschema
 [general]
@@ -39,7 +39,6 @@ LibName5=eSim_Hybrid
 LibName6=eSim_Miscellaneous
 LibName7=eSim_Plot
 LibName8=eSim_Power
-LibName9=eSim_PSpice
-LibName10=eSim_Sources
-LibName11=eSim_Subckt
-LibName12=eSim_User
+LibName9=eSim_Sources
+LibName10=eSim_Subckt
+LibName11=eSim_User
diff --git a/Examples/Integrator_LM_741/lm_741.sch b/Examples/Integrator_LM_741/lm_741.sch
index 6a74cf22..45aa2cd1 100644
--- a/Examples/Integrator_LM_741/lm_741.sch
+++ b/Examples/Integrator_LM_741/lm_741.sch
@@ -1,697 +1,697 @@
-EESchema Schematic File Version 2

-LIBS:power

-LIBS:eSim_Analog

-LIBS:eSim_Devices

-LIBS:eSim_Digital

-LIBS:eSim_Hybrid

-LIBS:eSim_Miscellaneous

-LIBS:eSim_Plot

-LIBS:eSim_Power

-LIBS:eSim_PSpice

-LIBS:eSim_Sources

-LIBS:eSim_Subckt

-LIBS:eSim_User

-LIBS:lm_741-cache

-EELAYER 25 0

-EELAYER END

-$Descr A4 11693 8268

-encoding utf-8

-Sheet 1 1

-Title ""

-Date ""

-Rev ""

-Comp ""

-Comment1 ""

-Comment2 ""

-Comment3 ""

-Comment4 ""

-$EndDescr

-$Comp

-L eSim_NPN Q1

-U 1 1 5CE90A7B

-P 2650 2700

-F 0 "Q1" H 2550 2750 50  0000 R CNN

-F 1 "eSim_NPN" H 2600 2850 50  0000 R CNN

-F 2 "" H 2850 2800 29  0000 C CNN

-F 3 "" H 2650 2700 60  0000 C CNN

-	1    2650 2700

-	1    0    0    -1  

-$EndComp

-$Comp

-L eSim_NPN Q2

-U 1 1 5CE90A7C

-P 4300 2700

-F 0 "Q2" H 4200 2750 50  0000 R CNN

-F 1 "eSim_NPN" H 4250 2850 50  0000 R CNN

-F 2 "" H 4500 2800 29  0000 C CNN

-F 3 "" H 4300 2700 60  0000 C CNN

-	1    4300 2700

-	-1   0    0    -1  

-$EndComp

-$Comp

-L eSim_PNP Q6

-U 1 1 5CE90A7D

-P 3000 3200

-F 0 "Q6" H 2900 3250 50  0000 R CNN

-F 1 "eSim_PNP" H 2950 3350 50  0000 R CNN

-F 2 "" H 3200 3300 29  0000 C CNN

-F 3 "" H 3000 3200 60  0000 C CNN

-	1    3000 3200

-	-1   0    0    1   

-$EndComp

-$Comp

-L eSim_PNP Q5

-U 1 1 5CE90A7E

-P 3950 3200

-F 0 "Q5" H 3850 3250 50  0000 R CNN

-F 1 "eSim_PNP" H 3900 3350 50  0000 R CNN

-F 2 "" H 4150 3300 29  0000 C CNN

-F 3 "" H 3950 3200 60  0000 C CNN

-	1    3950 3200

-	1    0    0    1   

-$EndComp

-$Comp

-L eSim_NPN Q3

-U 1 1 5CE90A7F

-P 3300 4000

-F 0 "Q3" H 3200 4050 50  0000 R CNN

-F 1 "eSim_NPN" H 3250 4150 50  0000 R CNN

-F 2 "" H 3500 4100 29  0000 C CNN

-F 3 "" H 3300 4000 60  0000 C CNN

-	1    3300 4000

-	1    0    0    -1  

-$EndComp

-$Comp

-L eSim_PNP Q4

-U 1 1 5CE90A80

-P 3850 2000

-F 0 "Q4" H 3750 2050 50  0000 R CNN

-F 1 "eSim_PNP" H 3800 2150 50  0000 R CNN

-F 2 "" H 4050 2100 29  0000 C CNN

-F 3 "" H 3850 2000 60  0000 C CNN

-	1    3850 2000

-	-1   0    0    1   

-$EndComp

-$Comp

-L eSim_PNP Q9

-U 1 1 5CE90A81

-P 5200 2000

-F 0 "Q9" H 5100 2050 50  0000 R CNN

-F 1 "eSim_PNP" H 5150 2150 50  0000 R CNN

-F 2 "" H 5400 2100 29  0000 C CNN

-F 3 "" H 5200 2000 60  0000 C CNN

-	1    5200 2000

-	1    0    0    1   

-$EndComp

-$Comp

-L eSim_NPN Q8

-U 1 1 5CE90A82

-P 3950 4600

-F 0 "Q8" H 3850 4650 50  0000 R CNN

-F 1 "eSim_NPN" H 3900 4750 50  0000 R CNN

-F 2 "" H 4150 4700 29  0000 C CNN

-F 3 "" H 3950 4600 60  0000 C CNN

-	1    3950 4600

-	1    0    0    -1  

-$EndComp

-$Comp

-L eSim_NPN Q7

-U 1 1 5CE90A83

-P 3000 4600

-F 0 "Q7" H 2900 4650 50  0000 R CNN

-F 1 "eSim_NPN" H 2950 4750 50  0000 R CNN

-F 2 "" H 3200 4700 29  0000 C CNN

-F 3 "" H 3000 4600 60  0000 C CNN

-	1    3000 4600

-	-1   0    0    -1  

-$EndComp

-$Comp

-L eSim_R R1

-U 1 1 5CE90A84

-P 2850 5200

-F 0 "R1" H 2900 5330 50  0000 C CNN

-F 1 "1k" H 2900 5250 50  0000 C CNN

-F 2 "" H 2900 5180 30  0000 C CNN

-F 3 "" V 2900 5250 30  0000 C CNN

-	1    2850 5200

-	0    1    1    0   

-$EndComp

-$Comp

-L eSim_R R2

-U 1 1 5CE90A85

-P 3550 5200

-F 0 "R2" H 3600 5330 50  0000 C CNN

-F 1 "50k" H 3600 5250 50  0000 C CNN

-F 2 "" H 3600 5180 30  0000 C CNN

-F 3 "" V 3600 5250 30  0000 C CNN

-	1    3550 5200

-	0    1    1    0   

-$EndComp

-$Comp

-L eSim_R R3

-U 1 1 5CE90A86

-P 4000 5200

-F 0 "R3" H 4050 5330 50  0000 C CNN

-F 1 "1k" H 4050 5250 50  0000 C CNN

-F 2 "" H 4050 5180 30  0000 C CNN

-F 3 "" V 4050 5250 30  0000 C CNN

-	1    4000 5200

-	0    1    1    0   

-$EndComp

-$Comp

-L eSim_NPN Q12

-U 1 1 5CE90A87

-P 6300 4700

-F 0 "Q12" H 6200 4750 50  0000 R CNN

-F 1 "eSim_NPN" H 6250 4850 50  0000 R CNN

-F 2 "" H 6500 4800 29  0000 C CNN

-F 3 "" H 6300 4700 60  0000 C CNN

-	1    6300 4700

-	1    0    0    -1  

-$EndComp

-$Comp

-L eSim_NPN Q13

-U 1 1 5CE90A88

-P 5400 4700

-F 0 "Q13" H 5300 4750 50  0000 R CNN

-F 1 "eSim_NPN" H 5350 4850 50  0000 R CNN

-F 2 "" H 5600 4800 29  0000 C CNN

-F 3 "" H 5400 4700 60  0000 C CNN

-	1    5400 4700

-	-1   0    0    -1  

-$EndComp

-$Comp

-L eSim_R R4

-U 1 1 5CE90A89

-P 5250 5200

-F 0 "R4" H 5300 5330 50  0000 C CNN

-F 1 "5k" H 5300 5250 50  0000 C CNN

-F 2 "" H 5300 5180 30  0000 C CNN

-F 3 "" V 5300 5250 30  0000 C CNN

-	1    5250 5200

-	0    1    1    0   

-$EndComp

-$Comp

-L eSim_R R11

-U 1 1 5CE90A8A

-P 6350 2750

-F 0 "R11" H 6400 2880 50  0000 C CNN

-F 1 "39k" H 6400 2800 50  0000 C CNN

-F 2 "" H 6400 2730 30  0000 C CNN

-F 3 "" V 6400 2800 30  0000 C CNN

-	1    6350 2750

-	0    1    1    0   

-$EndComp

-$Comp

-L eSim_PNP Q10

-U 1 1 5CE90A8B

-P 6500 1950

-F 0 "Q10" H 6400 2000 50  0000 R CNN

-F 1 "eSim_PNP" H 6450 2100 50  0000 R CNN

-F 2 "" H 6700 2050 29  0000 C CNN

-F 3 "" H 6500 1950 60  0000 C CNN

-	1    6500 1950

-	-1   0    0    1   

-$EndComp

-$Comp

-L eSim_PNP Q11

-U 1 1 5CE90A8C

-P 7500 1950

-F 0 "Q11" H 7400 2000 50  0000 R CNN

-F 1 "eSim_PNP" H 7450 2100 50  0000 R CNN

-F 2 "" H 7700 2050 29  0000 C CNN

-F 3 "" H 7500 1950 60  0000 C CNN

-	1    7500 1950

-	1    0    0    1   

-$EndComp

-$Comp

-L eSim_NPN Q14

-U 1 1 5CE90A8D

-P 7500 3050

-F 0 "Q14" H 7400 3100 50  0000 R CNN

-F 1 "eSim_NPN" H 7450 3200 50  0000 R CNN

-F 2 "" H 7700 3150 29  0000 C CNN

-F 3 "" H 7500 3050 60  0000 C CNN

-	1    7500 3050

-	1    0    0    -1  

-$EndComp

-$Comp

-L eSim_R R8

-U 1 1 5CE90A8E

-P 7300 2600

-F 0 "R8" H 7350 2730 50  0000 C CNN

-F 1 "4.5k" H 7350 2650 50  0000 C CNN

-F 2 "" H 7350 2580 30  0000 C CNN

-F 3 "" V 7350 2650 30  0000 C CNN

-	1    7300 2600

-	-1   0    0    1   

-$EndComp

-$Comp

-L eSim_R R7

-U 1 1 5CE90A8F

-P 7300 3400

-F 0 "R7" H 7350 3530 50  0000 C CNN

-F 1 "7.5k" H 7350 3450 50  0000 C CNN

-F 2 "" H 7350 3380 30  0000 C CNN

-F 3 "" V 7350 3450 30  0000 C CNN

-	1    7300 3400

-	-1   0    0    1   

-$EndComp

-$Comp

-L eSim_C C1

-U 1 1 5CE90A90

-P 6600 3200

-F 0 "C1" H 6625 3300 50  0000 L CNN

-F 1 "30p" H 6625 3100 50  0000 L CNN

-F 2 "" H 6638 3050 30  0000 C CNN

-F 3 "" H 6600 3200 60  0000 C CNN

-	1    6600 3200

-	1    0    0    -1  

-$EndComp

-$Comp

-L eSim_NPN Q16

-U 1 1 5CE90A91

-P 7050 3950

-F 0 "Q16" H 6950 4000 50  0000 R CNN

-F 1 "eSim_NPN" H 7000 4100 50  0000 R CNN

-F 2 "" H 7250 4050 29  0000 C CNN

-F 3 "" H 7050 3950 60  0000 C CNN

-	1    7050 3950

-	1    0    0    -1  

-$EndComp

-$Comp

-L eSim_NPN Q15

-U 1 1 5CE90A92

-P 7500 4300

-F 0 "Q15" H 7400 4350 50  0000 R CNN

-F 1 "eSim_NPN" H 7450 4450 50  0000 R CNN

-F 2 "" H 7700 4400 29  0000 C CNN

-F 3 "" H 7500 4300 60  0000 C CNN

-	1    7500 4300

-	1    0    0    -1  

-$EndComp

-$Comp

-L eSim_R R5

-U 1 1 5CE90A93

-P 7100 5050

-F 0 "R5" H 7150 5180 50  0000 C CNN

-F 1 "50k" H 7150 5100 50  0000 C CNN

-F 2 "" H 7150 5030 30  0000 C CNN

-F 3 "" V 7150 5100 30  0000 C CNN

-	1    7100 5050

-	0    1    1    0   

-$EndComp

-$Comp

-L eSim_R R6

-U 1 1 5CE90A94

-P 7550 5050

-F 0 "R6" H 7600 5180 50  0000 C CNN

-F 1 "50" H 7600 5100 50  0000 C CNN

-F 2 "" H 7600 5030 30  0000 C CNN

-F 3 "" V 7600 5100 30  0000 C CNN

-	1    7550 5050

-	0    1    1    0   

-$EndComp

-$Comp

-L eSim_NPN Q17

-U 1 1 5CE90A95

-P 6800 4700

-F 0 "Q17" H 6700 4750 50  0000 R CNN

-F 1 "eSim_NPN" H 6750 4850 50  0000 R CNN

-F 2 "" H 7000 4800 29  0000 C CNN

-F 3 "" H 6800 4700 60  0000 C CNN

-	1    6800 4700

-	-1   0    0    -1  

-$EndComp

-$Comp

-L eSim_NPN Q18

-U 1 1 5CE90A96

-P 8800 2300

-F 0 "Q18" H 8700 2350 50  0000 R CNN

-F 1 "eSim_NPN" H 8750 2450 50  0000 R CNN

-F 2 "" H 9000 2400 29  0000 C CNN

-F 3 "" H 8800 2300 60  0000 C CNN

-	1    8800 2300

-	1    0    0    -1  

-$EndComp

-$Comp

-L eSim_NPN Q20

-U 1 1 5CE90A97

-P 8400 2750

-F 0 "Q20" H 8300 2800 50  0000 R CNN

-F 1 "eSim_NPN" H 8350 2900 50  0000 R CNN

-F 2 "" H 8600 2850 29  0000 C CNN

-F 3 "" H 8400 2750 60  0000 C CNN

-	1    8400 2750

-	-1   0    0    -1  

-$EndComp

-$Comp

-L eSim_R R9

-U 1 1 5CE90A98

-P 8850 3000

-F 0 "R9" H 8900 3130 50  0000 C CNN

-F 1 "25" H 8900 3050 50  0000 C CNN

-F 2 "" H 8900 2980 30  0000 C CNN

-F 3 "" V 8900 3050 30  0000 C CNN

-	1    8850 3000

-	0    1    1    0   

-$EndComp

-$Comp

-L eSim_R R10

-U 1 1 5CE90A99

-P 8850 3750

-F 0 "R10" H 8900 3880 50  0000 C CNN

-F 1 "50" H 8900 3800 50  0000 C CNN

-F 2 "" H 8900 3730 30  0000 C CNN

-F 3 "" V 8900 3800 30  0000 C CNN

-	1    8850 3750

-	0    1    1    0   

-$EndComp

-$Comp

-L eSim_PNP Q19

-U 1 1 5CE90A9A

-P 8800 4600

-F 0 "Q19" H 8700 4650 50  0000 R CNN

-F 1 "eSim_PNP" H 8750 4750 50  0000 R CNN

-F 2 "" H 9000 4700 29  0000 C CNN

-F 3 "" H 8800 4600 60  0000 C CNN

-	1    8800 4600

-	1    0    0    1   

-$EndComp

-$Comp

-L PORT U1

-U 3 1 5CE90A9B

-P 1900 1200

-F 0 "U1" H 1950 1300 30  0000 C CNN

-F 1 "PORT" H 1900 1200 30  0000 C CNN

-F 2 "" H 1900 1200 60  0000 C CNN

-F 3 "" H 1900 1200 60  0000 C CNN

-	3    1900 1200

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 2 1 5CE90A9C

-P 4500 1050

-F 0 "U1" H 4550 1150 30  0000 C CNN

-F 1 "PORT" H 4500 1050 30  0000 C CNN

-F 2 "" H 4500 1050 60  0000 C CNN

-F 3 "" H 4500 1050 60  0000 C CNN

-	2    4500 1050

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 7 1 5CE90A9D

-P 9750 1650

-F 0 "U1" H 9800 1750 30  0000 C CNN

-F 1 "PORT" H 9750 1650 30  0000 C CNN

-F 2 "" H 9750 1650 60  0000 C CNN

-F 3 "" H 9750 1650 60  0000 C CNN

-	7    9750 1650

-	-1   0    0    1   

-$EndComp

-$Comp

-L PORT U1

-U 6 1 5CE90A9E

-P 9750 3500

-F 0 "U1" H 9800 3600 30  0000 C CNN

-F 1 "PORT" H 9750 3500 30  0000 C CNN

-F 2 "" H 9750 3500 60  0000 C CNN

-F 3 "" H 9750 3500 60  0000 C CNN

-	6    9750 3500

-	-1   0    0    1   

-$EndComp

-$Comp

-L PORT U1

-U 4 1 5CE90A9F

-P 9700 5550

-F 0 "U1" H 9750 5650 30  0000 C CNN

-F 1 "PORT" H 9700 5550 30  0000 C CNN

-F 2 "" H 9700 5550 60  0000 C CNN

-F 3 "" H 9700 5550 60  0000 C CNN

-	4    9700 5550

-	-1   0    0    1   

-$EndComp

-Wire Wire Line

-	3200 3200 3750 3200

-Wire Wire Line

-	2750 2900 2750 2950

-Wire Wire Line

-	2750 2950 2900 2950

-Wire Wire Line

-	2900 2950 2900 3000

-Wire Wire Line

-	4200 2900 4200 2950

-Wire Wire Line

-	4200 2950 4050 2950

-Wire Wire Line

-	4050 2950 4050 3000

-Wire Wire Line

-	2900 3400 2900 4400

-Wire Wire Line

-	2900 4000 3100 4000

-Wire Wire Line

-	4200 2000 4200 2500

-Wire Wire Line

-	4200 2350 2750 2350

-Wire Wire Line

-	2750 2350 2750 2500

-Wire Wire Line

-	5000 2000 4050 2000

-Connection ~ 4200 2350

-Connection ~ 4200 2000

-Wire Wire Line

-	3750 2200 3750 2350

-Connection ~ 3750 2350

-Wire Wire Line

-	3750 1800 3750 1650

-Wire Wire Line

-	3400 1650 7600 1650

-Wire Wire Line

-	3400 1650 3400 3800

-Wire Wire Line

-	5300 1650 5300 1800

-Connection ~ 3750 1650

-Wire Wire Line

-	5300 2200 5300 4500

-Wire Wire Line

-	5300 3500 3650 3500

-Wire Wire Line

-	3650 3500 3650 3200

-Connection ~ 3650 3200

-Connection ~ 2900 4000

-Wire Wire Line

-	4050 4400 4050 3400

-Wire Wire Line

-	3400 4200 3400 4600

-Wire Wire Line

-	3200 4600 3750 4600

-Connection ~ 3400 4600

-Wire Wire Line

-	4050 5100 4050 4800

-Wire Wire Line

-	3600 5100 3600 4600

-Connection ~ 3600 4600

-Wire Wire Line

-	2900 5100 2900 4800

-Wire Wire Line

-	2900 5400 2900 5550

-Wire Wire Line

-	2900 5550 9450 5550

-Wire Wire Line

-	4050 5550 4050 5400

-Wire Wire Line

-	3600 5400 3600 5550

-Connection ~ 3600 5550

-Wire Wire Line

-	6100 4700 5600 4700

-Wire Wire Line

-	6400 2950 6400 4500

-Wire Wire Line

-	6400 4250 5900 4250

-Wire Wire Line

-	5900 4250 5900 4700

-Connection ~ 5900 4700

-Wire Wire Line

-	5300 5100 5300 4900

-Wire Wire Line

-	5300 5550 5300 5400

-Connection ~ 4050 5550

-Wire Wire Line

-	6400 5550 6400 4900

-Connection ~ 5300 5550

-Connection ~ 5300 3500

-Wire Wire Line

-	6400 1650 6400 1750

-Connection ~ 5300 1650

-Wire Wire Line

-	6400 2150 6400 2650

-Connection ~ 6400 4250

-Wire Wire Line

-	6700 1950 7300 1950

-Wire Wire Line

-	7000 1950 7000 2250

-Wire Wire Line

-	7000 2250 6400 2250

-Connection ~ 6400 2250

-Wire Wire Line

-	7600 1650 7600 1750

-Connection ~ 6400 1650

-Connection ~ 7000 1950

-Wire Wire Line

-	7600 3250 7600 4100

-Wire Wire Line

-	7600 3450 7400 3450

-Wire Wire Line

-	6900 3450 7100 3450

-Wire Wire Line

-	6900 2650 6900 3450

-Wire Wire Line

-	6900 3050 7300 3050

-Wire Wire Line

-	7600 2150 7600 2850

-Wire Wire Line

-	7600 2650 7400 2650

-Wire Wire Line

-	7100 2650 6900 2650

-Connection ~ 6900 3050

-Connection ~ 7600 2650

-Wire Wire Line

-	7300 4300 7150 4300

-Wire Wire Line

-	7150 4150 7150 4950

-Connection ~ 7600 3450

-Wire Wire Line

-	7600 3700 7150 3700

-Wire Wire Line

-	7150 3700 7150 3750

-Connection ~ 7600 3700

-Wire Wire Line

-	6600 3050 6600 2450

-Wire Wire Line

-	6600 2450 7600 2450

-Connection ~ 7600 2450

-Wire Wire Line

-	6600 3350 6600 3950

-Wire Wire Line

-	4050 3950 6850 3950

-Wire Wire Line

-	6700 3950 6700 4500

-Connection ~ 6700 3950

-Wire Wire Line

-	6700 4900 6700 5550

-Connection ~ 6400 5550

-Connection ~ 7150 4300

-Wire Wire Line

-	7600 4950 7600 4500

-Wire Wire Line

-	7000 4700 7600 4700

-Connection ~ 7600 4700

-Wire Wire Line

-	7600 5550 7600 5250

-Connection ~ 6700 5550

-Wire Wire Line

-	7150 5250 7150 5550

-Connection ~ 7150 5550

-Wire Wire Line

-	7600 2300 8600 2300

-Wire Wire Line

-	8300 2300 8300 2550

-Connection ~ 8300 2300

-Connection ~ 7600 2300

-Wire Wire Line

-	8900 2100 8900 1650

-Wire Wire Line

-	7550 1650 9500 1650

-Connection ~ 7550 1650

-Connection ~ 8900 1650

-Wire Wire Line

-	8900 2500 8900 2900

-Wire Wire Line

-	8900 2750 8600 2750

-Connection ~ 8900 2750

-Wire Wire Line

-	8300 2950 8300 3350

-Wire Wire Line

-	8300 3350 8900 3350

-Wire Wire Line

-	8900 3200 8900 3650

-Wire Wire Line

-	8900 4400 8900 3950

-Connection ~ 8900 3350

-Wire Wire Line

-	8900 3500 9500 3500

-Connection ~ 8900 3500

-Wire Wire Line

-	8900 5550 8900 4800

-Connection ~ 7600 5550

-Connection ~ 8900 5550

-Wire Wire Line

-	8600 4600 8100 4600

-Wire Wire Line

-	8100 4600 8100 3850

-Wire Wire Line

-	8100 3850 7600 3850

-Connection ~ 7600 3850

-Connection ~ 4050 3950

-Connection ~ 6600 3950

-Wire Wire Line

-	4500 2700 4750 2700

-Wire Wire Line

-	4750 2700 4750 1050

-Wire Wire Line

-	2450 2700 2150 2700

-Wire Wire Line

-	2150 2700 2150 1200

-$Comp

-L PORT U1

-U 5 1 5CE90AA0

-P 1850 4850

-F 0 "U1" H 1900 4950 30  0000 C CNN

-F 1 "PORT" H 1850 4850 30  0000 C CNN

-F 2 "" H 1850 4850 60  0000 C CNN

-F 3 "" H 1850 4850 60  0000 C CNN

-	5    1850 4850

-	1    0    0    -1  

-$EndComp

-$Comp

-L PORT U1

-U 1 1 5CE90AA1

-P 1850 5100

-F 0 "U1" H 1900 5200 30  0000 C CNN

-F 1 "PORT" H 1850 5100 30  0000 C CNN

-F 2 "" H 1850 5100 60  0000 C CNN

-F 3 "" H 1850 5100 60  0000 C CNN

-	1    1850 5100

-	1    0    0    -1  

-$EndComp

-Wire Wire Line

-	2100 5100 2700 5100

-Wire Wire Line

-	2700 5100 2700 5050

-Wire Wire Line

-	2700 5050 2900 5050

-Connection ~ 2900 5050

-Wire Wire Line

-	2100 4850 2550 4850

-Wire Wire Line

-	2550 4850 2550 4900

-Wire Wire Line

-	2550 4900 4050 4900

-Connection ~ 4050 4900

-$Comp

-L PORT U1

-U 8 1 5CE9368F

-P 9600 6050

-F 0 "U1" H 9650 6150 30  0000 C CNN

-F 1 "PORT" H 9600 6050 30  0000 C CNN

-F 2 "" H 9600 6050 60  0000 C CNN

-F 3 "" H 9600 6050 60  0000 C CNN

-	8    9600 6050

-	-1   0    0    1   

-$EndComp

-Wire Wire Line

-	9350 6050 9100 6050

-NoConn ~ 9100 6050

-$EndSCHEMATC

+EESchema Schematic File Version 2
+LIBS:lm_741-rescue
+LIBS:power
+LIBS:eSim_Analog
+LIBS:eSim_Devices
+LIBS:eSim_Digital
+LIBS:eSim_Hybrid
+LIBS:eSim_Miscellaneous
+LIBS:eSim_Plot
+LIBS:eSim_Power
+LIBS:eSim_Sources
+LIBS:eSim_Subckt
+LIBS:eSim_User
+LIBS:lm_741-cache
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L eSim_NPN-RESCUE-lm_741 Q1
+U 1 1 5CE90A7B
+P 2650 2700
+F 0 "Q1" H 2550 2750 50  0000 R CNN
+F 1 "eSim_NPN" H 2600 2850 50  0000 R CNN
+F 2 "" H 2850 2800 29  0000 C CNN
+F 3 "" H 2650 2700 60  0000 C CNN
+	1    2650 2700
+	1    0    0    -1  
+$EndComp
+$Comp
+L eSim_NPN-RESCUE-lm_741 Q2
+U 1 1 5CE90A7C
+P 4300 2700
+F 0 "Q2" H 4200 2750 50  0000 R CNN
+F 1 "eSim_NPN" H 4250 2850 50  0000 R CNN
+F 2 "" H 4500 2800 29  0000 C CNN
+F 3 "" H 4300 2700 60  0000 C CNN
+	1    4300 2700
+	-1   0    0    -1  
+$EndComp
+$Comp
+L eSim_PNP-RESCUE-lm_741 Q6
+U 1 1 5CE90A7D
+P 3000 3200
+F 0 "Q6" H 2900 3250 50  0000 R CNN
+F 1 "eSim_PNP" H 2950 3350 50  0000 R CNN
+F 2 "" H 3200 3300 29  0000 C CNN
+F 3 "" H 3000 3200 60  0000 C CNN
+	1    3000 3200
+	-1   0    0    1   
+$EndComp
+$Comp
+L eSim_PNP-RESCUE-lm_741 Q5
+U 1 1 5CE90A7E
+P 3950 3200
+F 0 "Q5" H 3850 3250 50  0000 R CNN
+F 1 "eSim_PNP" H 3900 3350 50  0000 R CNN
+F 2 "" H 4150 3300 29  0000 C CNN
+F 3 "" H 3950 3200 60  0000 C CNN
+	1    3950 3200
+	1    0    0    1   
+$EndComp
+$Comp
+L eSim_NPN-RESCUE-lm_741 Q3
+U 1 1 5CE90A7F
+P 3300 4000
+F 0 "Q3" H 3200 4050 50  0000 R CNN
+F 1 "eSim_NPN" H 3250 4150 50  0000 R CNN
+F 2 "" H 3500 4100 29  0000 C CNN
+F 3 "" H 3300 4000 60  0000 C CNN
+	1    3300 4000
+	1    0    0    -1  
+$EndComp
+$Comp
+L eSim_PNP-RESCUE-lm_741 Q4
+U 1 1 5CE90A80
+P 3850 2000
+F 0 "Q4" H 3750 2050 50  0000 R CNN
+F 1 "eSim_PNP" H 3800 2150 50  0000 R CNN
+F 2 "" H 4050 2100 29  0000 C CNN
+F 3 "" H 3850 2000 60  0000 C CNN
+	1    3850 2000
+	-1   0    0    1   
+$EndComp
+$Comp
+L eSim_PNP-RESCUE-lm_741 Q9
+U 1 1 5CE90A81
+P 5200 2000
+F 0 "Q9" H 5100 2050 50  0000 R CNN
+F 1 "eSim_PNP" H 5150 2150 50  0000 R CNN
+F 2 "" H 5400 2100 29  0000 C CNN
+F 3 "" H 5200 2000 60  0000 C CNN
+	1    5200 2000
+	1    0    0    1   
+$EndComp
+$Comp
+L eSim_NPN-RESCUE-lm_741 Q8
+U 1 1 5CE90A82
+P 3950 4600
+F 0 "Q8" H 3850 4650 50  0000 R CNN
+F 1 "eSim_NPN" H 3900 4750 50  0000 R CNN
+F 2 "" H 4150 4700 29  0000 C CNN
+F 3 "" H 3950 4600 60  0000 C CNN
+	1    3950 4600
+	1    0    0    -1  
+$EndComp
+$Comp
+L eSim_NPN-RESCUE-lm_741 Q7
+U 1 1 5CE90A83
+P 3000 4600
+F 0 "Q7" H 2900 4650 50  0000 R CNN
+F 1 "eSim_NPN" H 2950 4750 50  0000 R CNN
+F 2 "" H 3200 4700 29  0000 C CNN
+F 3 "" H 3000 4600 60  0000 C CNN
+	1    3000 4600
+	-1   0    0    -1  
+$EndComp
+$Comp
+L eSim_R R1
+U 1 1 5CE90A84
+P 2850 5200
+F 0 "R1" H 2900 5330 50  0000 C CNN
+F 1 "1k" H 2900 5250 50  0000 C CNN
+F 2 "" H 2900 5180 30  0000 C CNN
+F 3 "" V 2900 5250 30  0000 C CNN
+	1    2850 5200
+	0    1    1    0   
+$EndComp
+$Comp
+L eSim_R R2
+U 1 1 5CE90A85
+P 3550 5200
+F 0 "R2" H 3600 5330 50  0000 C CNN
+F 1 "50k" H 3600 5250 50  0000 C CNN
+F 2 "" H 3600 5180 30  0000 C CNN
+F 3 "" V 3600 5250 30  0000 C CNN
+	1    3550 5200
+	0    1    1    0   
+$EndComp
+$Comp
+L eSim_R R3
+U 1 1 5CE90A86
+P 4000 5200
+F 0 "R3" H 4050 5330 50  0000 C CNN
+F 1 "1k" H 4050 5250 50  0000 C CNN
+F 2 "" H 4050 5180 30  0000 C CNN
+F 3 "" V 4050 5250 30  0000 C CNN
+	1    4000 5200
+	0    1    1    0   
+$EndComp
+$Comp
+L eSim_NPN-RESCUE-lm_741 Q12
+U 1 1 5CE90A87
+P 6300 4700
+F 0 "Q12" H 6200 4750 50  0000 R CNN
+F 1 "eSim_NPN" H 6250 4850 50  0000 R CNN
+F 2 "" H 6500 4800 29  0000 C CNN
+F 3 "" H 6300 4700 60  0000 C CNN
+	1    6300 4700
+	1    0    0    -1  
+$EndComp
+$Comp
+L eSim_NPN-RESCUE-lm_741 Q13
+U 1 1 5CE90A88
+P 5400 4700
+F 0 "Q13" H 5300 4750 50  0000 R CNN
+F 1 "eSim_NPN" H 5350 4850 50  0000 R CNN
+F 2 "" H 5600 4800 29  0000 C CNN
+F 3 "" H 5400 4700 60  0000 C CNN
+	1    5400 4700
+	-1   0    0    -1  
+$EndComp
+$Comp
+L eSim_R R4
+U 1 1 5CE90A89
+P 5250 5200
+F 0 "R4" H 5300 5330 50  0000 C CNN
+F 1 "5k" H 5300 5250 50  0000 C CNN
+F 2 "" H 5300 5180 30  0000 C CNN
+F 3 "" V 5300 5250 30  0000 C CNN
+	1    5250 5200
+	0    1    1    0   
+$EndComp
+$Comp
+L eSim_R R11
+U 1 1 5CE90A8A
+P 6350 2750
+F 0 "R11" H 6400 2880 50  0000 C CNN
+F 1 "39k" H 6400 2800 50  0000 C CNN
+F 2 "" H 6400 2730 30  0000 C CNN
+F 3 "" V 6400 2800 30  0000 C CNN
+	1    6350 2750
+	0    1    1    0   
+$EndComp
+$Comp
+L eSim_PNP-RESCUE-lm_741 Q10
+U 1 1 5CE90A8B
+P 6500 1950
+F 0 "Q10" H 6400 2000 50  0000 R CNN
+F 1 "eSim_PNP" H 6450 2100 50  0000 R CNN
+F 2 "" H 6700 2050 29  0000 C CNN
+F 3 "" H 6500 1950 60  0000 C CNN
+	1    6500 1950
+	-1   0    0    1   
+$EndComp
+$Comp
+L eSim_PNP-RESCUE-lm_741 Q11
+U 1 1 5CE90A8C
+P 7500 1950
+F 0 "Q11" H 7400 2000 50  0000 R CNN
+F 1 "eSim_PNP" H 7450 2100 50  0000 R CNN
+F 2 "" H 7700 2050 29  0000 C CNN
+F 3 "" H 7500 1950 60  0000 C CNN
+	1    7500 1950
+	1    0    0    1   
+$EndComp
+$Comp
+L eSim_NPN-RESCUE-lm_741 Q14
+U 1 1 5CE90A8D
+P 7500 3050
+F 0 "Q14" H 7400 3100 50  0000 R CNN
+F 1 "eSim_NPN" H 7450 3200 50  0000 R CNN
+F 2 "" H 7700 3150 29  0000 C CNN
+F 3 "" H 7500 3050 60  0000 C CNN
+	1    7500 3050
+	1    0    0    -1  
+$EndComp
+$Comp
+L eSim_R R8
+U 1 1 5CE90A8E
+P 7300 2600
+F 0 "R8" H 7350 2730 50  0000 C CNN
+F 1 "4.5k" H 7350 2650 50  0000 C CNN
+F 2 "" H 7350 2580 30  0000 C CNN
+F 3 "" V 7350 2650 30  0000 C CNN
+	1    7300 2600
+	-1   0    0    1   
+$EndComp
+$Comp
+L eSim_R R7
+U 1 1 5CE90A8F
+P 7300 3400
+F 0 "R7" H 7350 3530 50  0000 C CNN
+F 1 "7.5k" H 7350 3450 50  0000 C CNN
+F 2 "" H 7350 3380 30  0000 C CNN
+F 3 "" V 7350 3450 30  0000 C CNN
+	1    7300 3400
+	-1   0    0    1   
+$EndComp
+$Comp
+L eSim_C C1
+U 1 1 5CE90A90
+P 6600 3200
+F 0 "C1" H 6625 3300 50  0000 L CNN
+F 1 "30p" H 6625 3100 50  0000 L CNN
+F 2 "" H 6638 3050 30  0000 C CNN
+F 3 "" H 6600 3200 60  0000 C CNN
+	1    6600 3200
+	1    0    0    -1  
+$EndComp
+$Comp
+L eSim_NPN-RESCUE-lm_741 Q16
+U 1 1 5CE90A91
+P 7050 3950
+F 0 "Q16" H 6950 4000 50  0000 R CNN
+F 1 "eSim_NPN" H 7000 4100 50  0000 R CNN
+F 2 "" H 7250 4050 29  0000 C CNN
+F 3 "" H 7050 3950 60  0000 C CNN
+	1    7050 3950
+	1    0    0    -1  
+$EndComp
+$Comp
+L eSim_NPN-RESCUE-lm_741 Q15
+U 1 1 5CE90A92
+P 7500 4300
+F 0 "Q15" H 7400 4350 50  0000 R CNN
+F 1 "eSim_NPN" H 7450 4450 50  0000 R CNN
+F 2 "" H 7700 4400 29  0000 C CNN
+F 3 "" H 7500 4300 60  0000 C CNN
+	1    7500 4300
+	1    0    0    -1  
+$EndComp
+$Comp
+L eSim_R R5
+U 1 1 5CE90A93
+P 7100 5050
+F 0 "R5" H 7150 5180 50  0000 C CNN
+F 1 "50k" H 7150 5100 50  0000 C CNN
+F 2 "" H 7150 5030 30  0000 C CNN
+F 3 "" V 7150 5100 30  0000 C CNN
+	1    7100 5050
+	0    1    1    0   
+$EndComp
+$Comp
+L eSim_R R6
+U 1 1 5CE90A94
+P 7550 5050
+F 0 "R6" H 7600 5180 50  0000 C CNN
+F 1 "50" H 7600 5100 50  0000 C CNN
+F 2 "" H 7600 5030 30  0000 C CNN
+F 3 "" V 7600 5100 30  0000 C CNN
+	1    7550 5050
+	0    1    1    0   
+$EndComp
+$Comp
+L eSim_NPN-RESCUE-lm_741 Q17
+U 1 1 5CE90A95
+P 6800 4700
+F 0 "Q17" H 6700 4750 50  0000 R CNN
+F 1 "eSim_NPN" H 6750 4850 50  0000 R CNN
+F 2 "" H 7000 4800 29  0000 C CNN
+F 3 "" H 6800 4700 60  0000 C CNN
+	1    6800 4700
+	-1   0    0    -1  
+$EndComp
+$Comp
+L eSim_NPN-RESCUE-lm_741 Q18
+U 1 1 5CE90A96
+P 8800 2300
+F 0 "Q18" H 8700 2350 50  0000 R CNN
+F 1 "eSim_NPN" H 8750 2450 50  0000 R CNN
+F 2 "" H 9000 2400 29  0000 C CNN
+F 3 "" H 8800 2300 60  0000 C CNN
+	1    8800 2300
+	1    0    0    -1  
+$EndComp
+$Comp
+L eSim_NPN-RESCUE-lm_741 Q20
+U 1 1 5CE90A97
+P 8400 2750
+F 0 "Q20" H 8300 2800 50  0000 R CNN
+F 1 "eSim_NPN" H 8350 2900 50  0000 R CNN
+F 2 "" H 8600 2850 29  0000 C CNN
+F 3 "" H 8400 2750 60  0000 C CNN
+	1    8400 2750
+	-1   0    0    -1  
+$EndComp
+$Comp
+L eSim_R R9
+U 1 1 5CE90A98
+P 8850 3000
+F 0 "R9" H 8900 3130 50  0000 C CNN
+F 1 "25" H 8900 3050 50  0000 C CNN
+F 2 "" H 8900 2980 30  0000 C CNN
+F 3 "" V 8900 3050 30  0000 C CNN
+	1    8850 3000
+	0    1    1    0   
+$EndComp
+$Comp
+L eSim_R R10
+U 1 1 5CE90A99
+P 8850 3750
+F 0 "R10" H 8900 3880 50  0000 C CNN
+F 1 "50" H 8900 3800 50  0000 C CNN
+F 2 "" H 8900 3730 30  0000 C CNN
+F 3 "" V 8900 3800 30  0000 C CNN
+	1    8850 3750
+	0    1    1    0   
+$EndComp
+$Comp
+L eSim_PNP-RESCUE-lm_741 Q19
+U 1 1 5CE90A9A
+P 8800 4600
+F 0 "Q19" H 8700 4650 50  0000 R CNN
+F 1 "eSim_PNP" H 8750 4750 50  0000 R CNN
+F 2 "" H 9000 4700 29  0000 C CNN
+F 3 "" H 8800 4600 60  0000 C CNN
+	1    8800 4600
+	1    0    0    1   
+$EndComp
+$Comp
+L PORT U1
+U 3 1 5CE90A9B
+P 1900 1200
+F 0 "U1" H 1950 1300 30  0000 C CNN
+F 1 "PORT" H 1900 1200 30  0000 C CNN
+F 2 "" H 1900 1200 60  0000 C CNN
+F 3 "" H 1900 1200 60  0000 C CNN
+	3    1900 1200
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 2 1 5CE90A9C
+P 4500 1050
+F 0 "U1" H 4550 1150 30  0000 C CNN
+F 1 "PORT" H 4500 1050 30  0000 C CNN
+F 2 "" H 4500 1050 60  0000 C CNN
+F 3 "" H 4500 1050 60  0000 C CNN
+	2    4500 1050
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 7 1 5CE90A9D
+P 9750 1650
+F 0 "U1" H 9800 1750 30  0000 C CNN
+F 1 "PORT" H 9750 1650 30  0000 C CNN
+F 2 "" H 9750 1650 60  0000 C CNN
+F 3 "" H 9750 1650 60  0000 C CNN
+	7    9750 1650
+	-1   0    0    1   
+$EndComp
+$Comp
+L PORT U1
+U 6 1 5CE90A9E
+P 9750 3500
+F 0 "U1" H 9800 3600 30  0000 C CNN
+F 1 "PORT" H 9750 3500 30  0000 C CNN
+F 2 "" H 9750 3500 60  0000 C CNN
+F 3 "" H 9750 3500 60  0000 C CNN
+	6    9750 3500
+	-1   0    0    1   
+$EndComp
+$Comp
+L PORT U1
+U 4 1 5CE90A9F
+P 9700 5550
+F 0 "U1" H 9750 5650 30  0000 C CNN
+F 1 "PORT" H 9700 5550 30  0000 C CNN
+F 2 "" H 9700 5550 60  0000 C CNN
+F 3 "" H 9700 5550 60  0000 C CNN
+	4    9700 5550
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	3200 3200 3750 3200
+Wire Wire Line
+	2750 2900 2750 2950
+Wire Wire Line
+	2750 2950 2900 2950
+Wire Wire Line
+	2900 2950 2900 3000
+Wire Wire Line
+	4200 2900 4200 2950
+Wire Wire Line
+	4200 2950 4050 2950
+Wire Wire Line
+	4050 2950 4050 3000
+Wire Wire Line
+	2900 3400 2900 4400
+Wire Wire Line
+	2900 4000 3100 4000
+Wire Wire Line
+	4200 2000 4200 2500
+Wire Wire Line
+	4200 2350 2750 2350
+Wire Wire Line
+	2750 2350 2750 2500
+Wire Wire Line
+	5000 2000 4050 2000
+Connection ~ 4200 2350
+Connection ~ 4200 2000
+Wire Wire Line
+	3750 2200 3750 2350
+Connection ~ 3750 2350
+Wire Wire Line
+	3750 1800 3750 1650
+Wire Wire Line
+	3400 1650 7600 1650
+Wire Wire Line
+	3400 1650 3400 3800
+Wire Wire Line
+	5300 1650 5300 1800
+Connection ~ 3750 1650
+Wire Wire Line
+	5300 2200 5300 4500
+Wire Wire Line
+	5300 3500 3650 3500
+Wire Wire Line
+	3650 3500 3650 3200
+Connection ~ 3650 3200
+Connection ~ 2900 4000
+Wire Wire Line
+	4050 4400 4050 3400
+Wire Wire Line
+	3400 4200 3400 4600
+Wire Wire Line
+	3200 4600 3750 4600
+Connection ~ 3400 4600
+Wire Wire Line
+	4050 5100 4050 4800
+Wire Wire Line
+	3600 5100 3600 4600
+Connection ~ 3600 4600
+Wire Wire Line
+	2900 5100 2900 4800
+Wire Wire Line
+	2900 5400 2900 5550
+Wire Wire Line
+	2900 5550 9450 5550
+Wire Wire Line
+	4050 5550 4050 5400
+Wire Wire Line
+	3600 5400 3600 5550
+Connection ~ 3600 5550
+Wire Wire Line
+	6100 4700 5600 4700
+Wire Wire Line
+	6400 2950 6400 4500
+Wire Wire Line
+	6400 4250 5900 4250
+Wire Wire Line
+	5900 4250 5900 4700
+Connection ~ 5900 4700
+Wire Wire Line
+	5300 5100 5300 4900
+Wire Wire Line
+	5300 5550 5300 5400
+Connection ~ 4050 5550
+Wire Wire Line
+	6400 5550 6400 4900
+Connection ~ 5300 5550
+Connection ~ 5300 3500
+Wire Wire Line
+	6400 1650 6400 1750
+Connection ~ 5300 1650
+Wire Wire Line
+	6400 2150 6400 2650
+Connection ~ 6400 4250
+Wire Wire Line
+	6700 1950 7300 1950
+Wire Wire Line
+	7000 1950 7000 2250
+Wire Wire Line
+	7000 2250 6400 2250
+Connection ~ 6400 2250
+Wire Wire Line
+	7600 1650 7600 1750
+Connection ~ 6400 1650
+Connection ~ 7000 1950
+Wire Wire Line
+	7600 3250 7600 4100
+Wire Wire Line
+	7600 3450 7400 3450
+Wire Wire Line
+	6900 3450 7100 3450
+Wire Wire Line
+	6900 2650 6900 3450
+Wire Wire Line
+	6900 3050 7300 3050
+Wire Wire Line
+	7600 2150 7600 2850
+Wire Wire Line
+	7600 2650 7400 2650
+Wire Wire Line
+	7100 2650 6900 2650
+Connection ~ 6900 3050
+Connection ~ 7600 2650
+Wire Wire Line
+	7300 4300 7150 4300
+Wire Wire Line
+	7150 4150 7150 4950
+Connection ~ 7600 3450
+Wire Wire Line
+	7600 3700 7150 3700
+Wire Wire Line
+	7150 3700 7150 3750
+Connection ~ 7600 3700
+Wire Wire Line
+	6600 3050 6600 2450
+Wire Wire Line
+	6600 2450 7600 2450
+Connection ~ 7600 2450
+Wire Wire Line
+	6600 3350 6600 3950
+Wire Wire Line
+	4050 3950 6850 3950
+Wire Wire Line
+	6700 3950 6700 4500
+Connection ~ 6700 3950
+Wire Wire Line
+	6700 4900 6700 5550
+Connection ~ 6400 5550
+Connection ~ 7150 4300
+Wire Wire Line
+	7600 4950 7600 4500
+Wire Wire Line
+	7000 4700 7600 4700
+Connection ~ 7600 4700
+Wire Wire Line
+	7600 5550 7600 5250
+Connection ~ 6700 5550
+Wire Wire Line
+	7150 5250 7150 5550
+Connection ~ 7150 5550
+Wire Wire Line
+	7600 2300 8600 2300
+Wire Wire Line
+	8300 2300 8300 2550
+Connection ~ 8300 2300
+Connection ~ 7600 2300
+Wire Wire Line
+	8900 2100 8900 1650
+Wire Wire Line
+	7550 1650 9500 1650
+Connection ~ 7550 1650
+Connection ~ 8900 1650
+Wire Wire Line
+	8900 2500 8900 2900
+Wire Wire Line
+	8900 2750 8600 2750
+Connection ~ 8900 2750
+Wire Wire Line
+	8300 2950 8300 3350
+Wire Wire Line
+	8300 3350 8900 3350
+Wire Wire Line
+	8900 3200 8900 3650
+Wire Wire Line
+	8900 4400 8900 3950
+Connection ~ 8900 3350
+Wire Wire Line
+	8900 3500 9500 3500
+Connection ~ 8900 3500
+Wire Wire Line
+	8900 5550 8900 4800
+Connection ~ 7600 5550
+Connection ~ 8900 5550
+Wire Wire Line
+	8600 4600 8100 4600
+Wire Wire Line
+	8100 4600 8100 3850
+Wire Wire Line
+	8100 3850 7600 3850
+Connection ~ 7600 3850
+Connection ~ 4050 3950
+Connection ~ 6600 3950
+Wire Wire Line
+	4500 2700 4750 2700
+Wire Wire Line
+	4750 2700 4750 1050
+Wire Wire Line
+	2450 2700 2150 2700
+Wire Wire Line
+	2150 2700 2150 1200
+$Comp
+L PORT U1
+U 5 1 5CE90AA0
+P 1850 4850
+F 0 "U1" H 1900 4950 30  0000 C CNN
+F 1 "PORT" H 1850 4850 30  0000 C CNN
+F 2 "" H 1850 4850 60  0000 C CNN
+F 3 "" H 1850 4850 60  0000 C CNN
+	5    1850 4850
+	1    0    0    -1  
+$EndComp
+$Comp
+L PORT U1
+U 1 1 5CE90AA1
+P 1850 5100
+F 0 "U1" H 1900 5200 30  0000 C CNN
+F 1 "PORT" H 1850 5100 30  0000 C CNN
+F 2 "" H 1850 5100 60  0000 C CNN
+F 3 "" H 1850 5100 60  0000 C CNN
+	1    1850 5100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2100 5100 2700 5100
+Wire Wire Line
+	2700 5100 2700 5050
+Wire Wire Line
+	2700 5050 2900 5050
+Connection ~ 2900 5050
+Wire Wire Line
+	2100 4850 2550 4850
+Wire Wire Line
+	2550 4850 2550 4900
+Wire Wire Line
+	2550 4900 4050 4900
+Connection ~ 4050 4900
+$Comp
+L PORT U1
+U 8 1 5CE9368F
+P 9600 6050
+F 0 "U1" H 9650 6150 30  0000 C CNN
+F 1 "PORT" H 9600 6050 30  0000 C CNN
+F 2 "" H 9600 6050 60  0000 C CNN
+F 3 "" H 9600 6050 60  0000 C CNN
+	8    9600 6050
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	9350 6050 9100 6050
+NoConn ~ 9100 6050
+$EndSCHEMATC
diff --git a/Examples/InvertingAmplifier/PowerDiode.lib b/Examples/InvertingAmplifier/PowerDiode.lib
deleted file mode 100644
index a2f61dce..00000000
--- a/Examples/InvertingAmplifier/PowerDiode.lib
+++ /dev/null
@@ -1,20 +0,0 @@
-.MODEL PowerDiode D(
-+ Vj=.75
-+ Nbvl=14.976
-+ Cjo=175p
-+ Rs=.25
-+ Isr=1.859n
-+ Eg=1.11
-+ M=.5516
-+ Nbv=1.6989
-+ N=1
-+ Tbv1=-21.277u
-+ bv=1800
-+ Fc=.5
-+ Ikf=0
-+ Nr=2
-+ Ibv=20.245m
-+ Is=2.2E-15
-+ Xti=3
-+ Ibvl=1.9556m
-)
\ No newline at end of file
diff --git a/Examples/InvertingAmplifier/ua741-cache.lib b/Examples/InvertingAmplifier/ua741-cache.lib
deleted file mode 100644
index 9114d342..00000000
--- a/Examples/InvertingAmplifier/ua741-cache.lib
+++ /dev/null
@@ -1,100 +0,0 @@
-EESchema-LIBRARY Version 2.3  Date: Saturday 17 November 2012 08:10:48 AM IST
-#encoding utf-8
-#
-# C
-#
-DEF C C 0 10 N Y 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "C" 50 -100 50 H V L CNN
-$FPLIST
- SM*
- C?
- C1-1
-$ENDFPLIST
-DRAW
-P 2 0 1 10  -100 -30  100 -30 N
-P 2 0 1 10  -100 30  100 30 N
-X ~ 1 0 200 170 D 40 40 1 1 P
-X ~ 2 0 -200 170 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# GND
-#
-DEF ~GND #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 0 30 H I C CNN
-F1 "GND" 0 -70 30 H I C CNN
-DRAW
-P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
-X GND 1 0 0 0 U 30 30 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# PORT
-#
-DEF PORT U 0 40 Y Y 8 F N
-F0 "U" 0 -50 30 H V C CNN
-F1 "PORT" 0 0 30 H V C CNN
-DRAW
-A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
-A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
-S -100 50 100 -50 0 1 0 N
-X ~ 1 250 0 100 L 30 30 1 1 I
-X ~ 2 250 0 100 L 30 30 2 1 I
-X ~ 3 250 0 100 L 30 30 3 1 I
-X ~ 4 250 0 100 L 30 30 4 1 I
-X ~ 5 250 0 100 L 30 30 5 1 I
-X ~ 6 250 0 100 L 30 30 6 1 I
-X ~ 7 250 0 100 L 30 30 7 1 I
-X ~ 8 250 0 100 L 30 30 8 1 I
-ENDDRAW
-ENDDEF
-#
-# PWR_FLAG
-#
-DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 270 30 H I C CNN
-F1 "PWR_FLAG" 0 230 30 H V C CNN
-DRAW
-X pwr 1 0 0 0 U 20 20 0 0 w
-P 3 0 1 0  0 0  0 100  0 100 N
-P 5 0 1 0  0 100  -100 150  0 200  100 150  0 100 N
-ENDDRAW
-ENDDEF
-#
-# R
-#
-DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
-$FPLIST
- R?
- SM0603
- SM0805
- R?-*
-$ENDFPLIST
-DRAW
-S -40 150 40 -150 0 1 12 N
-X ~ 1 0 250 100 D 60 60 1 1 P
-X ~ 2 0 -250 100 U 60 60 1 1 P
-ENDDRAW
-ENDDEF
-#
-# VCVS
-#
-DEF VCVS E 0 40 Y Y 1 F N
-F0 "E" -200 100 50 H V C CNN
-F1 "VCVS" -200 -50 50 H V C CNN
-$FPLIST
- 1_pin
-$ENDFPLIST
-DRAW
-S -100 100 100 -100 0 1 0 N
-X + 1 -300 50 200 R 35 35 1 1 P
-X - 2 300 50 200 L 35 35 1 1 P
-X +c 3 -50 -200 100 U 35 35 1 1 P
-X -c 4 50 -200 100 U 35 35 1 1 P
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/Examples/InvertingAmplifier/ua741.sch b/Examples/InvertingAmplifier/ua741.sch
index 7dfc5e1a..b06dcc17 100644
--- a/Examples/InvertingAmplifier/ua741.sch
+++ b/Examples/InvertingAmplifier/ua741.sch
@@ -1,46 +1,18 @@
-EESchema Schematic File Version 2  date Wednesday 19 December 2012 10:15:16 AM IST
+EESchema Schematic File Version 2
 LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:analogSpice
-LIBS:converterSpice
-LIBS:digitalSpice
-LIBS:linearSpice
-LIBS:measurementSpice
-LIBS:portSpice
-LIBS:sourcesSpice
-LIBS:analogXSpice
-LIBS:ua741-cache
-EELAYER 25  0
+LIBS:eSim_Devices
+LIBS:eSim_User
+LIBS:eSim_Subckt
+LIBS:eSim_Sources
+LIBS:eSim_Power
+LIBS:eSim_Plot
+LIBS:eSim_Miscellaneous
+LIBS:eSim_Hybrid
+LIBS:eSim_Digital
+LIBS:eSim_Analog
+EELAYER 25 0
 EELAYER END
-$Descr A4 11700 8267
+$Descr A4 11693 8268
 encoding utf-8
 Sheet 1 1
 Title ""
@@ -68,6 +40,8 @@ U 6 1 5082C027
 P 6250 2500
 F 0 "U1" H 6250 2450 30  0000 C CNN
 F 1 "PORT" H 6250 2500 30  0000 C CNN
+F 2 "" H 6250 2500 60  0001 C CNN
+F 3 "" H 6250 2500 60  0001 C CNN
 	6    6250 2500
 	-1   0    0    1   
 $EndComp
@@ -77,6 +51,8 @@ U 2 1 5082C011
 P 2300 3100
 F 0 "U1" H 2300 3050 30  0000 C CNN
 F 1 "PORT" H 2300 3100 30  0000 C CNN
+F 2 "" H 2300 3100 60  0001 C CNN
+F 3 "" H 2300 3100 60  0001 C CNN
 	2    2300 3100
 	1    0    0    -1  
 $EndComp
@@ -86,9 +62,57 @@ U 3 1 5082C00B
 P 2250 2600
 F 0 "U1" H 2250 2550 30  0000 C CNN
 F 1 "PORT" H 2250 2600 30  0000 C CNN
+F 2 "" H 2250 2600 60  0001 C CNN
+F 3 "" H 2250 2600 60  0001 C CNN
 	3    2250 2600
 	1    0    0    -1  
 $EndComp
+$Comp
+L PWR_FLAG #FLG1
+U 1 1 508152A0
+P 3450 3200
+F 0 "#FLG1" H 3450 3470 30  0001 C CNN
+F 1 "PWR_FLAG" H 3450 3430 30  0000 C CNN
+F 2 "" H 3450 3200 60  0001 C CNN
+F 3 "" H 3450 3200 60  0001 C CNN
+	1    3450 3200
+	1    0    0    -1  
+$EndComp
+$Comp
+L VCVS Eout1
+U 1 1 50813F0F
+P 5200 2900
+F 0 "Eout1" H 5000 3000 50  0000 C CNN
+F 1 "1" H 5000 2850 50  0000 C CNN
+F 2 "" H 5200 2900 60  0001 C CNN
+F 3 "" H 5200 2900 60  0001 C CNN
+	1    5200 2900
+	0    1    1    0   
+$EndComp
+$Comp
+L GND #PWR1
+U 1 1 50813E0D
+P 3700 3400
+F 0 "#PWR1" H 3700 3400 30  0001 C CNN
+F 1 "GND" H 3700 3330 30  0001 C CNN
+F 2 "" H 3700 3400 60  0001 C CNN
+F 3 "" H 3700 3400 60  0001 C CNN
+	1    3700 3400
+	1    0    0    -1  
+$EndComp
+$Comp
+L VCVS Ein1
+U 1 1 50813D7C
+P 3650 2850
+F 0 "Ein1" H 3450 2950 50  0000 C CNN
+F 1 "100e3" H 3450 2800 50  0000 C CNN
+F 2 "" H 3650 2850 60  0001 C CNN
+F 3 "" H 3650 2850 60  0001 C CNN
+	1    3650 2850
+	0    1    1    0   
+$EndComp
+Text Notes 2600 2900 0    60   ~ 0
+2e6\n
 Connection ~ 3700 3200
 Wire Wire Line
 	3450 3200 3700 3200
@@ -102,7 +126,7 @@ Wire Wire Line
 	5000 3300 5000 2950
 Connection ~ 3700 3300
 Wire Wire Line
-	4550 3300 4550 3100
+	4550 3000 4550 3300
 Wire Wire Line
 	3900 2500 3700 2500
 Wire Wire Line
@@ -141,79 +165,65 @@ Connection ~ 4550 2500
 Wire Wire Line
 	5250 2600 5250 2500
 Wire Wire Line
-	5250 2500 5350 2500
+	5250 2500 5400 2500
 Wire Wire Line
-	5850 2500 6000 2500
+	5700 2500 6000 2500
 $Comp
-L PWR_FLAG #FLG01
-U 1 1 508152A0
-P 3450 3200
-F 0 "#FLG01" H 3450 3470 30  0001 C CNN
-F 1 "PWR_FLAG" H 3450 3430 30  0000 C CNN
-	1    3450 3200
-	1    0    0    -1  
-$EndComp
-$Comp
-L R Rout1
-U 1 1 50813F5B
-P 5600 2500
-F 0 "Rout1" V 5680 2500 50  0000 C CNN
-F 1 "75" V 5600 2500 50  0000 C CNN
-	1    5600 2500
-	0    1    1    0   
-$EndComp
-$Comp
-L VCVS Eout1
-U 1 1 50813F0F
-P 5200 2900
-F 0 "Eout1" H 5000 3000 50  0000 C CNN
-F 1 "1" H 5000 2850 50  0000 C CNN
-	1    5200 2900
+L resistor Rin1
+U 1 1 5E71E232
+P 2950 2900
+F 0 "Rin1" H 3000 3030 50  0000 C CNN
+F 1 "2e6" H 3000 2850 50  0000 C CNN
+F 2 "" H 3000 2880 30  0000 C CNN
+F 3 "" V 3000 2950 30  0000 C CNN
+	1    2950 2900
 	0    1    1    0   
 $EndComp
+Wire Wire Line
+	3000 2600 3000 2800
 $Comp
-L C Cbw1
-U 1 1 50813EE0
-P 4550 2900
-F 0 "Cbw1" H 4600 3000 50  0000 L CNN
-F 1 "31.85e-9" H 4600 2800 50  0000 L CNN
-	1    4550 2900
+L resistor Rbw1
+U 1 1 5E71E326
+P 4050 2100
+F 0 "Rbw1" H 4100 2230 50  0000 C CNN
+F 1 "0.5e6" H 4100 2050 50  0000 C CNN
+F 2 "" H 4100 2080 30  0000 C CNN
+F 3 "" V 4100 2150 30  0000 C CNN
+	1    4050 2100
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	3900 2500 3900 2050
+Wire Wire Line
+	3900 2050 3950 2050
+Wire Wire Line
+	4250 2050 4400 2050
+Wire Wire Line
+	4400 2050 4400 2500
 $Comp
-L R Rbw1
-U 1 1 50813EAB
-P 4150 2500
-F 0 "Rbw1" V 4230 2500 50  0000 C CNN
-F 1 "0.5e6" V 4150 2500 50  0000 C CNN
-	1    4150 2500
-	0    1    1    0   
-$EndComp
-$Comp
-L GND #PWR02
-U 1 1 50813E0D
-P 3700 3400
-F 0 "#PWR02" H 3700 3400 30  0001 C CNN
-F 1 "GND" H 3700 3330 30  0001 C CNN
-	1    3700 3400
+L capacitor Cbw1
+U 1 1 5E71E45C
+P 4550 2850
+F 0 "Cbw1" H 4575 2950 50  0000 L CNN
+F 1 "31.85e-9" H 4575 2750 50  0000 L CNN
+F 2 "" H 4588 2700 30  0000 C CNN
+F 3 "" H 4550 2850 60  0000 C CNN
+	1    4550 2850
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCVS Ein1
-U 1 1 50813D7C
-P 3650 2850
-F 0 "Ein1" H 3450 2950 50  0000 C CNN
-F 1 "100e3" H 3450 2800 50  0000 C CNN
-	1    3650 2850
-	0    1    1    0   
-$EndComp
-$Comp
-L R Rin1
-U 1 1 50813C57
-P 3000 2850
-F 0 "Rin1" V 3080 2850 50  0000 C CNN
-F 1 "2e6" V 3000 2850 50  0000 C CNN
-	1    3000 2850
+L resistor Rout1
+U 1 1 5E71E59C
+P 5500 2250
+F 0 "Rout1" H 5550 2380 50  0000 C CNN
+F 1 "75" H 5550 2200 50  0000 C CNN
+F 2 "" H 5550 2230 30  0000 C CNN
+F 3 "" V 5550 2300 30  0000 C CNN
+	1    5500 2250
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	5400 2500 5400 2200
+Wire Wire Line
+	5700 2200 5700 2500
 $EndSCHEMATC
diff --git a/Examples/InvertingAmplifier/ua741_Previous_Values.xml b/Examples/InvertingAmplifier/ua741_Previous_Values.xml
deleted file mode 100644
index 9c7bb530..00000000
--- a/Examples/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/Examples/Monostable555/lm555n.pro b/Examples/Monostable555/lm555n.pro
index 0a5408b6..122470c9 100644
--- a/Examples/Monostable555/lm555n.pro
+++ b/Examples/Monostable555/lm555n.pro
@@ -1,57 +1,17 @@
-update=Tue Apr  2 17:35:59 2019
+update=Wed Mar 18 18:59:18 2020
 last_client=eeschema
 [eeschema]
 version=1
 LibDir=/home/yogesh/FreeEDA/library
 [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
-LibName41=eSim_User
-LibName42=eSim_Subckt
-LibName43=eSim_Sources
-LibName44=eSim_PSpice
-LibName45=eSim_Power
-LibName46=eSim_Plot
-LibName47=eSim_Miscellaneous
-LibName48=eSim_Hybrid
-LibName49=eSim_Digital
-LibName50=eSim_Devices
-LibName51=eSim_Analog
+LibName1=eSim_Analog
+LibName2=eSim_Devices
+LibName3=eSim_Digital
+LibName4=eSim_Hybrid
+LibName5=eSim_Miscellaneous
+LibName6=eSim_Plot
+LibName7=eSim_Power
+LibName8=eSim_Sources
+LibName9=eSim_Subckt
+LibName10=eSim_User
+LibName11=power
diff --git a/Examples/Monostable555/lm555n.sch b/Examples/Monostable555/lm555n.sch
index 28110b13..fc3cedcc 100644
--- a/Examples/Monostable555/lm555n.sch
+++ b/Examples/Monostable555/lm555n.sch
@@ -1,45 +1,15 @@
 EESchema Schematic File Version 2
-LIBS:lm555n-rescue
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:eSim_User
-LIBS:eSim_Subckt
-LIBS:eSim_Sources
-LIBS:eSim_PSpice
-LIBS:eSim_Power
-LIBS:eSim_Plot
-LIBS:eSim_Miscellaneous
-LIBS:eSim_Hybrid
-LIBS:eSim_Digital
-LIBS:eSim_Devices
 LIBS:eSim_Analog
+LIBS:eSim_Devices
+LIBS:eSim_Digital
+LIBS:eSim_Hybrid
+LIBS:eSim_Miscellaneous
+LIBS:eSim_Plot
+LIBS:eSim_Power
+LIBS:eSim_Sources
+LIBS:eSim_Subckt
+LIBS:eSim_User
+LIBS:power
 LIBS:lm555n-cache
 EELAYER 25 0
 EELAYER END
diff --git a/Examples/UJT_Relaxation_Oscillator/ujt-cache.lib b/Examples/UJT_Relaxation_Oscillator/ujt-cache.lib
deleted file mode 100644
index 9284f2d1..00000000
--- a/Examples/UJT_Relaxation_Oscillator/ujt-cache.lib
+++ /dev/null
@@ -1,137 +0,0 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# CCVS
-#
-DEF CCVS H 0 40 Y Y 1 F N
-F0 "H" 0 150 50 H V C CNN
-F1 "CCVS" -200 -50 50 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-$FPLIST
- 1_pin
-$ENDFPLIST
-DRAW
-S -100 100 100 -100 0 1 0 N
-X + 1 -300 50 200 R 35 35 1 1 P
-X - 2 300 50 200 L 35 35 1 1 P
-X +c 3 -50 -200 100 U 35 35 1 1 P
-X -c 4 50 -200 100 U 35 35 1 1 P
-ENDDRAW
-ENDDEF
-#
-# NLDS
-#
-DEF NLDS BB 0 40 Y Y 1 F N
-F0 "BB" 0 0 60 H V C CNN
-F1 "NLDS" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-C 0 0 141 0 1 0 N
-X 1 1 0 350 200 D 50 50 1 1 B
-X 2 2 0 -350 200 U 50 50 1 1 B
-ENDDRAW
-ENDDEF
-#
-# PORT
-#
-DEF PORT U 0 40 Y Y 26 F N
-F0 "U" 50 100 30 H V C CNN
-F1 "PORT" 0 0 30 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
-A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
-S -100 50 100 -50 0 1 0 N
-X ~ 1 250 0 100 L 30 30 1 1 B
-X ~ 2 250 0 100 L 30 30 2 1 B
-X ~ 3 250 0 100 L 30 30 3 1 B
-X ~ 4 250 0 100 L 30 30 4 1 B
-X ~ 5 250 0 100 L 30 30 5 1 B
-X ~ 6 250 0 100 L 30 30 6 1 B
-X ~ 7 250 0 100 L 30 30 7 1 B
-X ~ 8 250 0 100 L 30 30 8 1 B
-X ~ 9 250 0 100 L 30 30 9 1 B
-X ~ 10 250 0 100 L 30 30 10 1 B
-X ~ 11 250 0 100 L 30 30 11 1 B
-X ~ 12 250 0 100 L 30 30 12 1 B
-X ~ 13 250 0 100 L 30 30 13 1 B
-X ~ 14 250 0 100 L 30 30 14 1 B
-X ~ 15 250 0 100 L 30 30 15 1 B
-X ~ 16 250 0 100 L 30 30 16 1 B
-X ~ 17 250 0 100 L 30 30 17 1 B
-X ~ 18 250 0 100 L 30 30 18 1 B
-X ~ 19 250 0 100 L 30 30 19 1 B
-X ~ 20 250 0 100 L 30 30 20 1 B
-X ~ 21 250 0 100 L 30 30 21 1 B
-X ~ 22 250 0 100 L 30 30 22 1 B
-X ~ 23 250 0 100 L 30 30 23 1 B
-X ~ 24 250 0 100 L 30 30 24 1 B
-X ~ 25 250 0 100 L 30 30 25 1 B
-X ~ 26 250 0 100 L 30 30 26 1 B
-ENDDRAW
-ENDDEF
-#
-# eSim_C
-#
-DEF eSim_C C 0 10 N Y 1 F N
-F0 "C" 25 100 50 H V L CNN
-F1 "eSim_C" 25 -100 50 H V L CNN
-F2 "" 38 -150 30 H V C CNN
-F3 "" 0 0 60 H V C CNN
-$FPLIST
- C_*
-$ENDFPLIST
-DRAW
-P 2 0 1 20 -80 -30 80 -30 N
-P 2 0 1 20 -80 30 80 30 N
-X ~ 1 0 150 110 D 40 40 1 1 P
-X ~ 2 0 -150 110 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# eSim_Diode
-#
-DEF eSim_Diode D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "eSim_Diode" 0 -100 50 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-$FPLIST
- TO-???*
- *SingleDiode
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
-DRAW
-T 0 -100 50 60 0 0 0 A Normal 0 C C
-T 0 100 50 60 0 0 0 K Normal 0 C C
-P 2 0 1 6 50 50 50 -50 N
-P 3 0 1 0 -50 50 50 0 -50 -50 F
-X A 1 -150 0 100 R 40 40 1 1 P
-X K 2 150 0 100 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# eSim_R
-#
-DEF eSim_R R 0 0 N Y 1 F N
-F0 "R" 50 130 50 H V C CNN
-F1 "eSim_R" 50 -50 50 H V C CNN
-F2 "" 50 -20 30 H V C CNN
-F3 "" 50 50 30 V V C CNN
-$FPLIST
- R_*
- Resistor_*
-$ENDFPLIST
-DRAW
-S 150 10 -50 90 0 1 10 N
-X ~ 1 -100 50 50 R 60 60 1 1 P
-X ~ 2 200 50 50 L 60 60 1 1 P
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/Examples/UJT_Relaxation_Oscillator/ujt.cir b/Examples/UJT_Relaxation_Oscillator/ujt.cir
deleted file mode 100644
index 6bdab774..00000000
--- a/Examples/UJT_Relaxation_Oscillator/ujt.cir
+++ /dev/null
@@ -1,18 +0,0 @@
-* /home/saurabh/Downloads/eSim-1.1.2/src/SubcircuitLibrary/ujt/ujt.cir
-
-* EESchema Netlist Version 1.1 (Spice format) creation date: Mon Aug 26 17:18:46 2019
-
-* 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
-
-* Sheet Name: /
-R3  Net-_H1-Pad2_ Net-_H1-Pad1_ 1000k		
-H1  Net-_H1-Pad1_ Net-_H1-Pad2_ Net-_D1-Pad2_ Net-_B1-Pad1_ 1k		
-C1  Net-_B1-Pad1_ Net-_B1-Pad2_ 35p		
-R1  Net-_B1-Pad2_ Net-_R1-Pad2_ 38.15k		
-R2  Net-_R2-Pad1_ Net-_B1-Pad1_ 2.518k		
-U1  Net-_D1-Pad1_ Net-_R1-Pad2_ Net-_R2-Pad1_ PORT		
-B1  Net-_B1-Pad1_ Net-_B1-Pad2_ I=0.00028*V(5,7)+0.00575*V(5,7)*V(6)		
-D1  Net-_D1-Pad1_ Net-_D1-Pad2_ eSim_Diode		
-
-.end
diff --git a/Examples/UJT_Relaxation_Oscillator/ujt.cir.out b/Examples/UJT_Relaxation_Oscillator/ujt.cir.out
deleted file mode 100644
index 84d08b27..00000000
--- a/Examples/UJT_Relaxation_Oscillator/ujt.cir.out
+++ /dev/null
@@ -1,22 +0,0 @@
-* /home/saurabh/downloads/esim-1.1.2/src/subcircuitlibrary/ujt/ujt.cir
-
-.include D.lib
-r3  net-_h1-pad2_ net-_h1-pad1_ 1000k
-* h1
-c1  net-_b1-pad1_ net-_b1-pad2_ 35p
-r1  net-_b1-pad2_ net-_r1-pad2_ 38.15k
-r2  net-_r2-pad1_ net-_b1-pad1_ 2.518k
-* u1  net-_d1-pad1_ net-_r1-pad2_ net-_r2-pad1_ port
-b1  net-_b1-pad1_ net-_b1-pad2_ i=0.00028*v(5,7)+0.00575*v(5,7)*v(6)
-d1 net-_d1-pad1_ net-_d1-pad2_ 1N4148
-Vh1 net-_d1-pad2_ net-_b1-pad1_ 0
-h1 net-_h1-pad1_ net-_h1-pad2_ Vh1 1k
-.tran 5e-03 100e-03 0e-03
-
-* Control Statements 
-.control
-run
-print allv > plot_data_v.txt
-print alli > plot_data_i.txt
-.endc
-.end
diff --git a/Examples/UJT_Relaxation_Oscillator/ujt.pro b/Examples/UJT_Relaxation_Oscillator/ujt.pro
deleted file mode 100644
index 24c5e186..00000000
--- a/Examples/UJT_Relaxation_Oscillator/ujt.pro
+++ /dev/null
@@ -1,44 +0,0 @@
-update=Tue Jun 11 16:36:40 2019
-version=1
-last_client=eeschema
-[general]
-version=1
-RootSch=
-BoardNm=
-[pcbnew]
-version=1
-LastNetListRead=
-UseCmpFile=1
-PadDrill=0.600000000000
-PadDrillOvalY=0.600000000000
-PadSizeH=1.500000000000
-PadSizeV=1.500000000000
-PcbTextSizeV=1.500000000000
-PcbTextSizeH=1.500000000000
-PcbTextThickness=0.300000000000
-ModuleTextSizeV=1.000000000000
-ModuleTextSizeH=1.000000000000
-ModuleTextSizeThickness=0.150000000000
-SolderMaskClearance=0.000000000000
-SolderMaskMinWidth=0.000000000000
-DrawSegmentWidth=0.200000000000
-BoardOutlineThickness=0.100000000000
-ModuleOutlineThickness=0.150000000000
-[cvpcb]
-version=1
-NetIExt=net
-[eeschema]
-version=1
-LibDir=../../../kicadSchematicLibrary
-[eeschema/libraries]
-LibName1=power
-LibName2=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_User
-LibName3=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Subckt
-LibName4=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Sources
-LibName5=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Power
-LibName6=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Plot
-LibName7=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Miscellaneous
-LibName8=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Hybrid
-LibName9=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Digital
-LibName10=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Devices
-LibName11=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Analog
diff --git a/Examples/UJT_Relaxation_Oscillator/ujt.sch b/Examples/UJT_Relaxation_Oscillator/ujt.sch
deleted file mode 100644
index 581fcfe7..00000000
--- a/Examples/UJT_Relaxation_Oscillator/ujt.sch
+++ /dev/null
@@ -1,173 +0,0 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:eSim_User
-LIBS:eSim_Subckt
-LIBS:eSim_Sources
-LIBS:eSim_Power
-LIBS:eSim_Plot
-LIBS:eSim_Miscellaneous
-LIBS:eSim_Hybrid
-LIBS:eSim_Digital
-LIBS:eSim_Devices
-LIBS:eSim_Analog
-LIBS:ujt-cache
-EELAYER 25 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 1
-Title ""
-Date ""
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L eSim_R R3
-U 1 1 5CF5F733
-P 6650 3400
-F 0 "R3" H 6700 3530 50  0000 C CNN
-F 1 "1000k" H 6700 3450 50  0000 C CNN
-F 2 "" H 6700 3380 30  0000 C CNN
-F 3 "" V 6700 3450 30  0000 C CNN
-	1    6650 3400
-	0    1    -1   0   
-$EndComp
-$Comp
-L CCVS H1
-U 1 1 5CF5F77B
-P 6150 3350
-F 0 "H1" H 6150 3500 50  0000 C CNN
-F 1 "1k" H 5950 3300 50  0000 C CNN
-F 2 "" H 6150 3350 60  0000 C CNN
-F 3 "" H 6150 3350 60  0000 C CNN
-	1    6150 3350
-	0    1    1    0   
-$EndComp
-$Comp
-L eSim_C C1
-U 1 1 5CF61B3A
-P 5150 4700
-F 0 "C1" H 5175 4800 50  0000 L CNN
-F 1 "35p" H 5175 4600 50  0000 L CNN
-F 2 "" H 5188 4550 30  0000 C CNN
-F 3 "" H 5150 4700 60  0000 C CNN
-	1    5150 4700
-	1    0    0    -1  
-$EndComp
-$Comp
-L eSim_R R1
-U 1 1 5CF6211F
-P 4300 4850
-F 0 "R1" H 4350 4980 50  0000 C CNN
-F 1 "38.15k" H 4350 4900 50  0000 C CNN
-F 2 "" H 4350 4830 30  0000 C CNN
-F 3 "" V 4350 4900 30  0000 C CNN
-	1    4300 4850
-	0    -1   -1   0   
-$EndComp
-$Comp
-L eSim_R R2
-U 1 1 5CF6218A
-P 4550 3650
-F 0 "R2" H 4600 3780 50  0000 C CNN
-F 1 "2.518k" H 4600 3700 50  0000 C CNN
-F 2 "" H 4600 3630 30  0000 C CNN
-F 3 "" V 4600 3700 30  0000 C CNN
-	1    4550 3650
-	0    1    1    0   
-$EndComp
-$Comp
-L PORT U1
-U 2 1 5CF6830A
-P 4250 4150
-F 0 "U1" H 4300 4250 30  0000 C CNN
-F 1 "PORT" H 4250 4150 30  0000 C CNN
-F 2 "" H 4250 4150 60  0000 C CNN
-F 3 "" H 4250 4150 60  0000 C CNN
-	2    4250 4150
-	0    1    1    0   
-$EndComp
-$Comp
-L PORT U1
-U 1 1 5CF689AD
-P 5950 2200
-F 0 "U1" H 6000 2300 30  0000 C CNN
-F 1 "PORT" H 5950 2200 30  0000 C CNN
-F 2 "" H 5950 2200 60  0000 C CNN
-F 3 "" H 5950 2200 60  0000 C CNN
-	1    5950 2200
-	0    1    1    0   
-$EndComp
-$Comp
-L PORT U1
-U 3 1 5CF69586
-P 4600 3000
-F 0 "U1" H 4650 3100 30  0000 C CNN
-F 1 "PORT" H 4600 3000 30  0000 C CNN
-F 2 "" H 4600 3000 60  0000 C CNN
-F 3 "" H 4600 3000 60  0000 C CNN
-	3    4600 3000
-	0    1    1    0   
-$EndComp
-$Comp
-L NLDS B1
-U 1 1 5CFD2C88
-P 5950 4800
-F 0 "B1" H 5950 4800 60  0000 C CNN
-F 1 "I=0.00028*V(5,7)+0.00575*V(5,7)*V(6)" H 7050 4900 60  0000 C CNN
-F 2 "" H 5950 4800 60  0000 C CNN
-F 3 "" H 5950 4800 60  0000 C CNN
-	1    5950 4800
-	1    0    0    -1  
-$EndComp
-$Comp
-L eSim_Diode D1
-U 1 1 5CFF8BB7
-P 5950 2850
-F 0 "D1" H 5950 2950 50  0000 C CNN
-F 1 "eSim_Diode" H 5950 2750 50  0000 C CNN
-F 2 "" H 5950 2850 60  0000 C CNN
-F 3 "" H 5950 2850 60  0000 C CNN
-	1    5950 2850
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	6200 3050 6700 3050
-Wire Wire Line
-	6700 3050 6700 3200
-Wire Wire Line
-	6200 3650 6700 3650
-Wire Wire Line
-	5950 2450 5950 2700
-Wire Wire Line
-	5950 3000 5950 3300
-Wire Wire Line
-	5950 3400 5950 4450
-Wire Wire Line
-	5150 4100 5150 4550
-Wire Wire Line
-	4600 4100 5950 4100
-Connection ~ 5950 4100
-Wire Wire Line
-	5150 4850 5150 5250
-Wire Wire Line
-	4250 5250 5950 5250
-Wire Wire Line
-	4250 5250 4250 4950
-Wire Wire Line
-	4600 4100 4600 3850
-Connection ~ 5150 4100
-Wire Wire Line
-	4250 4650 4250 4400
-Wire Wire Line
-	4600 3550 4600 3250
-Wire Wire Line
-	5950 5250 5950 5150
-Connection ~ 5150 5250
-Wire Wire Line
-	6700 3650 6700 3500
-$EndSCHEMATC