17 files changed, 227 insertions, 239 deletions

diff --git a/library/SubcircuitLibrary/7485/3_and.pro b/library/SubcircuitLibrary/7485/3_and.pro
index 2c9ac554..f2572d86 100644
--- a/library/SubcircuitLibrary/7485/3_and.pro
+++ b/library/SubcircuitLibrary/7485/3_and.pro
@@ -1,4 +1,4 @@
-update=03/26/19 18:40:23
+update=Wed Mar 18 20:07:22 2020
 version=1
 last_client=eeschema
 [general]
@@ -52,7 +52,6 @@ LibName18=eSim_Hybrid
 LibName19=eSim_Miscellaneous
 LibName20=eSim_Plot
 LibName21=eSim_Power
-LibName22=eSim_PSpice
-LibName23=eSim_Sources
-LibName24=eSim_Subckt
-LibName25=eSim_User
+LibName22=eSim_Sources
+LibName23=eSim_Subckt
+LibName24=eSim_User
diff --git a/library/SubcircuitLibrary/7485/4_and-cache.lib b/library/SubcircuitLibrary/7485/4_and-cache.lib
index ac396288..e7636dd5 100644
--- a/library/SubcircuitLibrary/7485/4_and-cache.lib
+++ b/library/SubcircuitLibrary/7485/4_and-cache.lib
@@ -1,17 +1,17 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# 3_and
+# 3_and-RESCUE-4_and
 #
-DEF 3_and X 0 40 Y Y 1 F N
+DEF 3_and-RESCUE-4_and X 0 40 Y Y 1 F N
 F0 "X" 900 300 60 H V C CNN
-F1 "3_and" 950 500 60 H V C CNN
+F1 "3_and-RESCUE-4_and" 950 500 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250
-P 2 0 1 0  650 550  1000 550 N
-P 3 0 1 0  650 550  650 250  1000 250 N
+P 2 0 1 0 650 550 1000 550 N
+P 3 0 1 0 650 550 650 250 1000 250 N
 X in1 1 450 500 200 R 50 50 1 1 I
 X in2 2 450 400 200 R 50 50 1 1 I
 X in3 3 450 300 200 R 50 50 1 1 I
@@ -69,7 +69,7 @@ F3 "" 0 0 60 H V C CNN
 DRAW
 A 149 50 100 -894 0 0 1 0 N 150 -50 250 50
 A 150 49 100 6 900 0 1 0 N 250 50 150 150
-P 4 0 1 0  150 -50  -250 -50  -250 150  150 150 N
+P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N
 X IN1 1 -450 100 200 R 50 50 1 1 I
 X IN2 2 -450 0 200 R 50 50 1 1 I
 X OUT 3 450 50 200 L 50 50 1 1 O
diff --git a/library/SubcircuitLibrary/7485/4_and-rescue.lib b/library/SubcircuitLibrary/7485/4_and-rescue.lib
new file mode 100644
index 00000000..49f649ad
--- /dev/null
+++ b/library/SubcircuitLibrary/7485/4_and-rescue.lib
@@ -0,0 +1,22 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 3_and-RESCUE-4_and
+#
+DEF 3_and-RESCUE-4_and X 0 40 Y Y 1 F N
+F0 "X" 900 300 60 H V C CNN
+F1 "3_and-RESCUE-4_and" 950 500 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250
+P 2 0 1 0 650 550 1000 550 N
+P 3 0 1 0 650 550 650 250 1000 250 N
+X in1 1 450 500 200 R 50 50 1 1 I
+X in2 2 450 400 200 R 50 50 1 1 I
+X in3 3 450 300 200 R 50 50 1 1 I
+X out 4 1300 400 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/library/SubcircuitLibrary/7485/4_and.pro b/library/SubcircuitLibrary/7485/4_and.pro
index 6eb77fff..1904462e 100644
--- a/library/SubcircuitLibrary/7485/4_and.pro
+++ b/library/SubcircuitLibrary/7485/4_and.pro
@@ -1,4 +1,4 @@
-update=03/26/19 18:58:33
+update=Wed Mar 18 20:07:48 2020
 version=1
 last_client=eeschema
 [general]
@@ -51,7 +51,6 @@ LibName17=eSim_Hybrid
 LibName18=eSim_Miscellaneous
 LibName19=eSim_Plot
 LibName20=eSim_Power
-LibName21=eSim_PSpice
-LibName22=eSim_Sources
-LibName23=eSim_Subckt
-LibName24=eSim_User
+LibName21=eSim_Sources
+LibName22=eSim_Subckt
+LibName23=eSim_User
diff --git a/library/SubcircuitLibrary/7485/4_and.sch b/library/SubcircuitLibrary/7485/4_and.sch
index 883458e1..87b2bf51 100644
--- a/library/SubcircuitLibrary/7485/4_and.sch
+++ b/library/SubcircuitLibrary/7485/4_and.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:4_and-rescue
 LIBS:texas
 LIBS:intel
 LIBS:audio
@@ -19,10 +20,10 @@ 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:4_and-cache
 EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
@@ -38,7 +39,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L 3_and X1
+L 3_and-RESCUE-4_and X1
 U 1 1 5C9A2915
 P 3700 3500
 F 0 "X1" H 4600 3800 60  0000 C CNN
diff --git a/library/SubcircuitLibrary/7485/5_and-cache.lib b/library/SubcircuitLibrary/7485/5_and-cache.lib
index ac396288..0032562a 100644
--- a/library/SubcircuitLibrary/7485/5_and-cache.lib
+++ b/library/SubcircuitLibrary/7485/5_and-cache.lib
@@ -1,24 +1,6 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# 3_and
-#
-DEF 3_and X 0 40 Y Y 1 F N
-F0 "X" 900 300 60 H V C CNN
-F1 "3_and" 950 500 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250
-P 2 0 1 0  650 550  1000 550 N
-P 3 0 1 0  650 550  650 250  1000 250 N
-X in1 1 450 500 200 R 50 50 1 1 I
-X in2 2 450 400 200 R 50 50 1 1 I
-X in3 3 450 300 200 R 50 50 1 1 I
-X out 4 1300 400 200 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
 # PORT
 #
 DEF PORT U 0 40 Y Y 26 F N
@@ -69,7 +51,7 @@ F3 "" 0 0 60 H V C CNN
 DRAW
 A 149 50 100 -894 0 0 1 0 N 150 -50 250 50
 A 150 49 100 6 900 0 1 0 N 250 50 150 150
-P 4 0 1 0  150 -50  -250 -50  -250 150  150 150 N
+P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N
 X IN1 1 -450 100 200 R 50 50 1 1 I
 X IN2 2 -450 0 200 R 50 50 1 1 I
 X OUT 3 450 50 200 L 50 50 1 1 O
diff --git a/library/SubcircuitLibrary/7485/5_and-rescue.lib b/library/SubcircuitLibrary/7485/5_and-rescue.lib
new file mode 100644
index 00000000..483b8efb
--- /dev/null
+++ b/library/SubcircuitLibrary/7485/5_and-rescue.lib
@@ -0,0 +1,22 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 3_and-RESCUE-5_and
+#
+DEF 3_and-RESCUE-5_and X 0 40 Y Y 1 F N
+F0 "X" 900 300 60 H V C CNN
+F1 "3_and-RESCUE-5_and" 950 500 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250
+P 2 0 1 0 650 550 1000 550 N
+P 3 0 1 0 650 550 650 250 1000 250 N
+X in1 1 450 500 200 R 50 50 1 1 I
+X in2 2 450 400 200 R 50 50 1 1 I
+X in3 3 450 300 200 R 50 50 1 1 I
+X out 4 1300 400 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/library/SubcircuitLibrary/7485/5_and.pro b/library/SubcircuitLibrary/7485/5_and.pro
index c82e4e6d..3b76cce9 100644
--- a/library/SubcircuitLibrary/7485/5_and.pro
+++ b/library/SubcircuitLibrary/7485/5_and.pro
@@ -1,4 +1,4 @@
-update=03/26/19 18:50:27
+update=Wed Mar 18 20:08:07 2020
 version=1
 last_client=eeschema
 [general]
@@ -44,7 +44,6 @@ LibName10=eSim_Hybrid
 LibName11=eSim_Miscellaneous
 LibName12=eSim_Plot
 LibName13=eSim_Power
-LibName14=eSim_PSpice
-LibName15=eSim_Sources
-LibName16=eSim_Subckt
-LibName17=eSim_User
+LibName14=eSim_Sources
+LibName15=eSim_Subckt
+LibName16=eSim_User
diff --git a/library/SubcircuitLibrary/7485/5_and.sch b/library/SubcircuitLibrary/7485/5_and.sch
index da927b09..1426d055 100644
--- a/library/SubcircuitLibrary/7485/5_and.sch
+++ b/library/SubcircuitLibrary/7485/5_and.sch
@@ -12,10 +12,10 @@ 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:5_and-cache
 EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
@@ -31,7 +31,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L 3_and X1
+L 3_and-RESCUE-5_and X1
 U 1 1 5C9A2741
 P 3800 3350
 F 0 "X1" H 4700 3650 60  0000 C CNN
diff --git a/library/SubcircuitLibrary/7485/7485-cache.lib b/library/SubcircuitLibrary/7485/7485-cache.lib
index 6edb5033..4328b632 100644
--- a/library/SubcircuitLibrary/7485/7485-cache.lib
+++ b/library/SubcircuitLibrary/7485/7485-cache.lib
@@ -1,17 +1,17 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# 3_and
+# 3_and-RESCUE-7485
 #
-DEF 3_and X 0 40 Y Y 1 F N
+DEF 3_and-RESCUE-7485 X 0 40 Y Y 1 F N
 F0 "X" 900 300 60 H V C CNN
-F1 "3_and" 950 500 60 H V C CNN
+F1 "3_and-RESCUE-7485" 950 500 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250
-P 2 0 1 0  650 550  1000 550 N
-P 3 0 1 0  650 550  650 250  1000 250 N
+P 2 0 1 0 650 550 1000 550 N
+P 3 0 1 0 650 550 650 250 1000 250 N
 X in1 1 450 500 200 R 50 50 1 1 I
 X in2 2 450 400 200 R 50 50 1 1 I
 X in3 3 450 300 200 R 50 50 1 1 I
@@ -19,17 +19,17 @@ X out 4 1300 400 200 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-# 4_and
+# 4_and-RESCUE-7485
 #
-DEF 4_and X 0 40 Y Y 1 F N
+DEF 4_and-RESCUE-7485 X 0 40 Y Y 1 F N
 F0 "X" 1500 1050 60 H V C CNN
-F1 "4_and" 1550 1200 60 H V C CNN
+F1 "4_and-RESCUE-7485" 1550 1200 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 A 1550 1100 206 760 -760 0 1 0 N 1600 1300 1600 900
-P 2 0 1 0  1250 1300  1600 1300 N
-P 4 0 1 0  1250 1300  1250 900  1500 900  1600 900 N
+P 2 0 1 0 1250 1300 1600 1300 N
+P 4 0 1 0 1250 1300 1250 900 1500 900 1600 900 N
 X in1 1 1050 1250 200 R 50 50 1 1 I
 X in2 2 1050 1150 200 R 50 50 1 1 I
 X in3 3 1050 1050 200 R 50 50 1 1 I
@@ -38,17 +38,17 @@ X out 5 1950 1100 200 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-# 5_and
+# 5_and-RESCUE-7485
 #
-DEF 5_and X 0 40 Y Y 1 F N
+DEF 5_and-RESCUE-7485 X 0 40 Y Y 1 F N
 F0 "X" 1350 800 60 H V C CNN
-F1 "5_and" 1400 1050 60 H V C CNN
+F1 "5_and-RESCUE-7485" 1400 1050 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 A 1400 900 255 787 -787 0 1 0 N 1450 1150 1450 650
-P 2 0 1 0  1050 1150  1450 1150 N
-P 3 0 1 0  1050 1150  1050 650  1450 650 N
+P 2 0 1 0 1050 1150 1450 1150 N
+P 3 0 1 0 1050 1150 1050 650 1450 650 N
 X in1 1 850 1100 200 R 50 50 1 1 I
 X in2 2 850 1000 200 R 50 50 1 1 I
 X in3 3 850 900 200 R 50 50 1 1 I
@@ -107,8 +107,8 @@ F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 A 6000 4550 316 716 -716 0 1 0 N 6100 4850 6100 4250
-P 2 0 1 0  5550 4850  6100 4850 N
-P 4 0 1 0  5550 4850  5550 4250  6050 4250  6100 4250 N
+P 2 0 1 0 5550 4850 6100 4850 N
+P 4 0 1 0 5550 4850 5550 4250 6050 4250 6100 4250 N
 X in1 1 5350 4800 200 R 50 50 1 1 I I
 X in2 2 5350 4700 200 R 50 50 1 1 I I
 X in3 3 5350 4600 200 R 50 50 1 1 I I
@@ -129,7 +129,7 @@ F3 "" 0 0 60 H V C CNN
 DRAW
 A 149 50 100 -894 0 0 1 0 N 150 -50 250 50
 A 150 49 100 6 900 0 1 0 N 250 50 150 150
-P 4 0 1 0  150 -50  -250 -50  -250 150  150 150 N
+P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N
 X IN1 1 -450 100 200 R 50 50 1 1 I
 X IN2 2 -450 0 200 R 50 50 1 1 I
 X OUT 3 450 50 200 L 50 50 1 1 O
@@ -146,7 +146,7 @@ F3 "" 0 0 60 H V C CNN
 DRAW
 A 149 50 100 -894 0 0 1 0 N 150 -50 250 50
 A 150 49 100 6 900 0 1 0 N 250 50 150 150
-P 4 0 1 0  150 -50  -250 -50  -250 150  150 150 N
+P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N
 X IN1 1 -450 100 200 R 50 50 1 1 I
 X IN2 2 -450 0 200 R 50 50 1 1 I
 X OUT 3 450 50 200 L 50 50 1 1 O I
@@ -164,8 +164,8 @@ DRAW
 A -450 50 224 266 -266 0 1 0 N -250 150 -250 -50
 A -25 -124 325 574 323 0 1 0 N 150 150 250 50
 A 74 125 191 -665 -231 0 1 0 N 150 -50 250 50
-P 2 0 1 0  -250 -50  150 -50 N
-P 2 0 1 0  -250 150  150 150 N
+P 2 0 1 0 -250 -50 150 -50 N
+P 2 0 1 0 -250 150 150 150 N
 X IN1 1 -450 100 215 R 50 50 1 1 I
 X IN2 2 -450 0 215 R 50 50 1 1 I
 X OUT 3 450 50 200 L 50 50 1 1 O I
diff --git a/library/SubcircuitLibrary/7485/7485-rescue.lib b/library/SubcircuitLibrary/7485/7485-rescue.lib
new file mode 100644
index 00000000..f94d6ecc
--- /dev/null
+++ b/library/SubcircuitLibrary/7485/7485-rescue.lib
@@ -0,0 +1,61 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 3_and-RESCUE-7485
+#
+DEF 3_and-RESCUE-7485 X 0 40 Y Y 1 F N
+F0 "X" 900 300 60 H V C CNN
+F1 "3_and-RESCUE-7485" 950 500 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250
+P 2 0 1 0 650 550 1000 550 N
+P 3 0 1 0 650 550 650 250 1000 250 N
+X in1 1 450 500 200 R 50 50 1 1 I
+X in2 2 450 400 200 R 50 50 1 1 I
+X in3 3 450 300 200 R 50 50 1 1 I
+X out 4 1300 400 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# 4_and-RESCUE-7485
+#
+DEF 4_and-RESCUE-7485 X 0 40 Y Y 1 F N
+F0 "X" 1500 1050 60 H V C CNN
+F1 "4_and-RESCUE-7485" 1550 1200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 1550 1100 206 760 -760 0 1 0 N 1600 1300 1600 900
+P 2 0 1 0 1250 1300 1600 1300 N
+P 4 0 1 0 1250 1300 1250 900 1500 900 1600 900 N
+X in1 1 1050 1250 200 R 50 50 1 1 I
+X in2 2 1050 1150 200 R 50 50 1 1 I
+X in3 3 1050 1050 200 R 50 50 1 1 I
+X in4 4 1050 950 200 R 50 50 1 1 I
+X out 5 1950 1100 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# 5_and-RESCUE-7485
+#
+DEF 5_and-RESCUE-7485 X 0 40 Y Y 1 F N
+F0 "X" 1350 800 60 H V C CNN
+F1 "5_and-RESCUE-7485" 1400 1050 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 1400 900 255 787 -787 0 1 0 N 1450 1150 1450 650
+P 2 0 1 0 1050 1150 1450 1150 N
+P 3 0 1 0 1050 1150 1050 650 1450 650 N
+X in1 1 850 1100 200 R 50 50 1 1 I
+X in2 2 850 1000 200 R 50 50 1 1 I
+X in3 3 850 900 200 R 50 50 1 1 I
+X in4 4 850 800 200 R 50 50 1 1 I
+X in5 5 850 700 200 R 50 50 1 1 I
+X out 6 1850 900 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/library/SubcircuitLibrary/7485/7485.pro b/library/SubcircuitLibrary/7485/7485.pro
index 1f89e4a2..87d0c274 100644
--- a/library/SubcircuitLibrary/7485/7485.pro
+++ b/library/SubcircuitLibrary/7485/7485.pro
@@ -1,4 +1,4 @@
-update=03/26/19 19:27:48
+update=Wed Mar 18 20:06:33 2020
 version=1
 last_client=eeschema
 [general]
diff --git a/library/SubcircuitLibrary/7485/7485.sch b/library/SubcircuitLibrary/7485/7485.sch
index 0db5f0d6..e3f5364d 100644
--- a/library/SubcircuitLibrary/7485/7485.sch
+++ b/library/SubcircuitLibrary/7485/7485.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:7485-rescue
 LIBS:power
 LIBS:texas
 LIBS:intel
@@ -20,10 +21,9 @@ LIBS:eSim_Hybrid
 LIBS:eSim_Miscellaneous
 LIBS:eSim_Plot
 LIBS:eSim_Power
-LIBS:eSim_PSpice
+LIBS:eSim_Subckt
 LIBS:eSim_Sources
 LIBS:eSim_User
-LIBS:eSim_Subckt
 LIBS:7485-cache
 EELAYER 25 0
 EELAYER END
@@ -95,7 +95,7 @@ F 3 "" H 6900 1000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3_and X12
+L 3_and-RESCUE-7485 X12
 U 1 1 5C9A2DC4
 P 6050 1650
 F 0 "X12" H 6950 1950 60  0000 C CNN
@@ -106,7 +106,7 @@ F 3 "" H 6050 1650 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 4_and X7
+L 4_and-RESCUE-7485 X7
 U 1 1 5C9A2EB7
 P 5450 2750
 F 0 "X7" H 6950 3800 60  0000 C CNN
@@ -117,7 +117,7 @@ F 3 "" H 5450 2750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 5_and X9
+L 5_and-RESCUE-7485 X9
 U 1 1 5C9A2F2E
 P 5650 3050
 F 0 "X9" H 7000 3850 60  0000 C CNN
@@ -128,7 +128,7 @@ F 3 "" H 5650 3050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 5_and X10
+L 5_and-RESCUE-7485 X10
 U 1 1 5C9A2F95
 P 5650 3600
 F 0 "X10" H 7000 4400 60  0000 C CNN
@@ -139,7 +139,7 @@ F 3 "" H 5650 3600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 5_and X11
+L 5_and-RESCUE-7485 X11
 U 1 1 5C9A3164
 P 5650 4150
 F 0 "X11" H 7000 4950 60  0000 C CNN
@@ -150,7 +150,7 @@ F 3 "" H 5650 4150 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 5_and X13
+L 5_and-RESCUE-7485 X13
 U 1 1 5C9A31B3
 P 7550 4850
 F 0 "X13" H 8900 5650 60  0000 C CNN
@@ -172,7 +172,7 @@ F 3 "" H 6350 6900 60  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L 3_and X8
+L 3_and-RESCUE-7485 X8
 U 1 1 5C9A3303
 P 5500 6250
 F 0 "X8" H 6400 6550 60  0000 C CNN
@@ -183,7 +183,7 @@ F 3 "" H 5500 6250 60  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L 4_and X3
+L 4_and-RESCUE-7485 X3
 U 1 1 5C9A3309
 P 4900 5150
 F 0 "X3" H 6400 6200 60  0000 C CNN
@@ -194,7 +194,7 @@ F 3 "" H 4900 5150 60  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L 5_and X6
+L 5_and-RESCUE-7485 X6
 U 1 1 5C9A330F
 P 5100 4850
 F 0 "X6" H 6450 5650 60  0000 C CNN
@@ -205,7 +205,7 @@ F 3 "" H 5100 4850 60  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L 5_and X5
+L 5_and-RESCUE-7485 X5
 U 1 1 5C9A3315
 P 5100 4300
 F 0 "X5" H 6450 5100 60  0000 C CNN
@@ -216,7 +216,7 @@ F 3 "" H 5100 4300 60  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L 5_and X4
+L 5_and-RESCUE-7485 X4
 U 1 1 5C9A331B
 P 5100 3750
 F 0 "X4" H 6450 4550 60  0000 C CNN
@@ -385,29 +385,15 @@ Wire Wire Line
 Wire Wire Line
 	3600 1400 3600 1550
 Wire Wire Line
-	2700 1000 2700 1200
-Wire Wire Line
-	2700 1200 2700 1400
-Wire Wire Line
-	2700 1400 2700 1500
-Wire Wire Line
-	2700 1500 2700 4700
+	2700 1000 2700 4700
 Wire Wire Line
 	2700 1600 1550 1600
 Wire Wire Line
-	1550 1600 1550 1450
-Wire Wire Line
-	1100 1450 1500 1450
-Wire Wire Line
-	1500 1450 1550 1450
-Wire Wire Line
-	1550 1450 1650 1450
+	1550 1450 1550 1600
 Wire Wire Line
-	1100 1350 1400 1350
+	1100 1450 1650 1450
 Wire Wire Line
-	1400 1350 1550 1350
-Wire Wire Line
-	1550 1350 1650 1350
+	1100 1350 1650 1350
 Wire Wire Line
 	1550 1350 1550 1100
 Wire Wire Line
@@ -422,29 +408,15 @@ Wire Wire Line
 Wire Wire Line
 	3700 2800 3700 2950
 Wire Wire Line
-	2800 2000 2800 2600
-Wire Wire Line
-	2800 2600 2800 2800
-Wire Wire Line
-	2800 2800 2800 2900
-Wire Wire Line
-	2800 2900 2800 4600
+	2800 2000 2800 4600
 Wire Wire Line
 	2800 3000 1650 3000
 Wire Wire Line
-	1650 3000 1650 2850
-Wire Wire Line
-	1200 2850 1600 2850
-Wire Wire Line
-	1600 2850 1650 2850
-Wire Wire Line
-	1650 2850 1750 2850
-Wire Wire Line
-	1200 2750 1450 2750
+	1650 2850 1650 3000
 Wire Wire Line
-	1450 2750 1650 2750
+	1200 2850 1750 2850
 Wire Wire Line
-	1650 2750 1750 2750
+	1200 2750 1750 2750
 Wire Wire Line
 	1650 2750 1650 2500
 Wire Wire Line
@@ -459,29 +431,15 @@ Wire Wire Line
 Wire Wire Line
 	4050 5150 4050 5300
 Wire Wire Line
-	3150 4950 3150 5000
-Wire Wire Line
-	3150 5000 3150 5150
-Wire Wire Line
-	3150 5150 3150 5250
-Wire Wire Line
-	3150 5250 3150 5850
+	3150 4950 3150 5850
 Wire Wire Line
 	3150 5350 2000 5350
 Wire Wire Line
-	2000 5350 2000 5200
-Wire Wire Line
-	1250 5200 1500 5200
+	2000 5200 2000 5350
 Wire Wire Line
-	1500 5200 2000 5200
+	1250 5200 2100 5200
 Wire Wire Line
-	2000 5200 2100 5200
-Wire Wire Line
-	1250 5100 1800 5100
-Wire Wire Line
-	1800 5100 2000 5100
-Wire Wire Line
-	2000 5100 2100 5100
+	1250 5100 2100 5100
 Wire Wire Line
 	2000 5100 2000 4850
 Wire Wire Line
@@ -496,29 +454,15 @@ Wire Wire Line
 Wire Wire Line
 	3850 3950 3850 4100
 Wire Wire Line
-	2950 3200 2950 3750
-Wire Wire Line
-	2950 3750 2950 3950
-Wire Wire Line
-	2950 3950 2950 4050
-Wire Wire Line
-	2950 4050 2950 4350
+	2950 3200 2950 4350
 Wire Wire Line
 	2950 4150 1800 4150
 Wire Wire Line
-	1800 4150 1800 4000
-Wire Wire Line
-	1350 4000 1750 4000
-Wire Wire Line
-	1750 4000 1800 4000
+	1800 4000 1800 4150
 Wire Wire Line
-	1800 4000 1900 4000
+	1350 4000 1900 4000
 Wire Wire Line
-	1200 3900 1600 3900
-Wire Wire Line
-	1600 3900 1800 3900
-Wire Wire Line
-	1800 3900 1900 3900
+	1200 3900 1900 3900
 Wire Wire Line
 	1800 3900 1800 3650
 Wire Wire Line
@@ -557,29 +501,9 @@ Connection ~ 2800 2900
 Wire Wire Line
 	5100 6550 5950 6550
 Wire Wire Line
-	5100 1350 5100 1700
-Wire Wire Line
-	5100 1700 5100 2150
+	5100 1350 5100 6550
 Wire Wire Line
-	5100 2150 5100 2500
-Wire Wire Line
-	5100 2500 5100 3050
-Wire Wire Line
-	5100 3050 5100 3750
-Wire Wire Line
-	5100 3750 5100 4850
-Wire Wire Line
-	5100 4850 5100 5400
-Wire Wire Line
-	5100 5400 5100 5750
-Wire Wire Line
-	5100 5750 5100 6300
-Wire Wire Line
-	5100 6300 5100 6550
-Wire Wire Line
-	4500 1350 5100 1350
-Wire Wire Line
-	5100 1350 6500 1350
+	4500 1350 6500 1350
 Wire Wire Line
 	1500 1450 1500 900 
 Wire Wire Line
@@ -627,23 +551,7 @@ Connection ~ 5100 1700
 Wire Wire Line
 	6500 1800 5250 1800
 Wire Wire Line
-	5250 1800 5250 2250
-Wire Wire Line
-	5250 2250 5250 2600
-Wire Wire Line
-	5250 2600 5250 2750
-Wire Wire Line
-	5250 2750 5250 3150
-Wire Wire Line
-	5250 3150 5250 3850
-Wire Wire Line
-	5250 3850 5250 4750
-Wire Wire Line
-	5250 4750 5250 5300
-Wire Wire Line
-	5250 5300 5250 5650
-Wire Wire Line
-	5250 5650 5250 6100
+	5250 1800 5250 6100
 Wire Wire Line
 	5250 2750 4600 2750
 Wire Wire Line
@@ -669,19 +577,7 @@ Connection ~ 5250 2250
 Wire Wire Line
 	6500 2350 5350 2350
 Wire Wire Line
-	5350 2350 5350 2700
-Wire Wire Line
-	5350 2700 5350 3200
-Wire Wire Line
-	5350 3200 5350 3900
-Wire Wire Line
-	5350 3900 5350 4050
-Wire Wire Line
-	5350 4050 5350 4650
-Wire Wire Line
-	5350 4650 5350 5200
-Wire Wire Line
-	5350 5200 5350 5550
+	5350 2350 5350 5550
 Wire Wire Line
 	5350 3900 4750 3900
 Wire Wire Line
@@ -696,17 +592,9 @@ Connection ~ 5350 2700
 Wire Wire Line
 	6500 2800 5450 2800
 Wire Wire Line
-	5450 2800 5450 3350
-Wire Wire Line
-	5450 3350 5450 4150
+	5450 2800 5450 5100
 Wire Wire Line
-	5450 4150 5450 4550
-Wire Wire Line
-	5450 4550 5450 5100
-Wire Wire Line
-	4950 5100 5450 5100
-Wire Wire Line
-	5450 5100 5950 5100
+	4950 5100 5950 5100
 Wire Wire Line
 	6500 2900 5550 2900
 Wire Wire Line
@@ -730,19 +618,13 @@ Wire Wire Line
 	6500 3350 5450 3350
 Connection ~ 5450 3350
 Wire Wire Line
-	4800 3450 5950 3450
-Wire Wire Line
-	5950 3450 6500 3450
+	4800 3450 6500 3450
 Wire Wire Line
-	4800 3450 4800 3400
+	4800 3400 4800 3450
 Wire Wire Line
-	4800 3400 2600 3400
+	1050 3400 4800 3400
 Wire Wire Line
-	2050 3400 1050 3400
-Wire Wire Line
-	5950 3450 5950 3950
-Wire Wire Line
-	5950 3950 5950 4450
+	5950 3450 5950 4450
 Connection ~ 5950 3450
 Wire Wire Line
 	5950 4550 5450 4550
@@ -1122,6 +1004,4 @@ Wire Notes Line
 	10550 1550 9500 1550
 Text Notes 9900 3400 0    60   ~ 12
 Outputs
-Wire Wire Line
-	2600 3400 2050 3400
 $EndSCHEMATC
diff --git a/library/SubcircuitLibrary/7485/c_gate-cache.lib b/library/SubcircuitLibrary/7485/c_gate-cache.lib
index 05fb44d7..b65670b7 100644
--- a/library/SubcircuitLibrary/7485/c_gate-cache.lib
+++ b/library/SubcircuitLibrary/7485/c_gate-cache.lib
@@ -1,17 +1,17 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# 5_and
+# 5_and-RESCUE-c_gate
 #
-DEF 5_and X 0 40 Y Y 1 F N
+DEF 5_and-RESCUE-c_gate X 0 40 Y Y 1 F N
 F0 "X" 1350 800 60 H V C CNN
-F1 "5_and" 1400 1050 60 H V C CNN
+F1 "5_and-RESCUE-c_gate" 1400 1050 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 A 1400 900 255 787 -787 0 1 0 N 1450 1150 1450 650
-P 2 0 1 0  1050 1150  1450 1150 N
-P 3 0 1 0  1050 1150  1050 650  1450 650 N
+P 2 0 1 0 1050 1150 1450 1150 N
+P 3 0 1 0 1050 1150 1050 650 1450 650 N
 X in1 1 850 1100 200 R 50 50 1 1 I
 X in2 2 850 1000 200 R 50 50 1 1 I
 X in3 3 850 900 200 R 50 50 1 1 I
@@ -71,7 +71,7 @@ F3 "" 0 0 60 H V C CNN
 DRAW
 A 149 50 100 -894 0 0 1 0 N 150 -50 250 50
 A 150 49 100 6 900 0 1 0 N 250 50 150 150
-P 4 0 1 0  150 -50  -250 -50  -250 150  150 150 N
+P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N
 X IN1 1 -450 100 200 R 50 50 1 1 I
 X IN2 2 -450 0 200 R 50 50 1 1 I
 X OUT 3 450 50 200 L 50 50 1 1 O
@@ -86,7 +86,7 @@ F1 "d_inverter" 0 150 60 H V C CNN
 F2 "" 50 -50 60 H V C CNN
 F3 "" 50 -50 60 H V C CNN
 DRAW
-P 4 0 1 0  -100 50  -100 -50  100 0  -100 50 N
+P 4 0 1 0 -100 50 -100 -50 100 0 -100 50 N
 X ~ 1 -300 0 200 R 50 50 1 1 I
 X ~ 2 300 0 200 L 50 50 1 1 O I
 ENDDRAW
diff --git a/library/SubcircuitLibrary/7485/c_gate-rescue.lib b/library/SubcircuitLibrary/7485/c_gate-rescue.lib
new file mode 100644
index 00000000..00a7cb20
--- /dev/null
+++ b/library/SubcircuitLibrary/7485/c_gate-rescue.lib
@@ -0,0 +1,24 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 5_and-RESCUE-c_gate
+#
+DEF 5_and-RESCUE-c_gate X 0 40 Y Y 1 F N
+F0 "X" 1350 800 60 H V C CNN
+F1 "5_and-RESCUE-c_gate" 1400 1050 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 1400 900 255 787 -787 0 1 0 N 1450 1150 1450 650
+P 2 0 1 0 1050 1150 1450 1150 N
+P 3 0 1 0 1050 1150 1050 650 1450 650 N
+X in1 1 850 1100 200 R 50 50 1 1 I
+X in2 2 850 1000 200 R 50 50 1 1 I
+X in3 3 850 900 200 R 50 50 1 1 I
+X in4 4 850 800 200 R 50 50 1 1 I
+X in5 5 850 700 200 R 50 50 1 1 I
+X out 6 1850 900 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/library/SubcircuitLibrary/7485/c_gate.pro b/library/SubcircuitLibrary/7485/c_gate.pro
index f0743529..366050e3 100644
--- a/library/SubcircuitLibrary/7485/c_gate.pro
+++ b/library/SubcircuitLibrary/7485/c_gate.pro
@@ -1,4 +1,4 @@
-update=03/26/19 19:06:59
+update=Wed Mar 18 20:08:46 2020
 version=1
 last_client=eeschema
 [general]
@@ -51,7 +51,6 @@ LibName17=eSim_Hybrid
 LibName18=eSim_Miscellaneous
 LibName19=eSim_Plot
 LibName20=eSim_Power
-LibName21=eSim_PSpice
-LibName22=eSim_Sources
-LibName23=eSim_Subckt
-LibName24=eSim_User
+LibName21=eSim_Sources
+LibName22=eSim_Subckt
+LibName23=eSim_User
diff --git a/library/SubcircuitLibrary/7485/c_gate.sch b/library/SubcircuitLibrary/7485/c_gate.sch
index 5d960c8d..c2a2b71c 100644
--- a/library/SubcircuitLibrary/7485/c_gate.sch
+++ b/library/SubcircuitLibrary/7485/c_gate.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:c_gate-rescue
 LIBS:texas
 LIBS:intel
 LIBS:audio
@@ -19,7 +20,6 @@ LIBS:eSim_Hybrid
 LIBS:eSim_Miscellaneous
 LIBS:eSim_Plot
 LIBS:eSim_Power
-LIBS:eSim_PSpice
 LIBS:eSim_Sources
 LIBS:eSim_Subckt
 LIBS:eSim_User
@@ -39,7 +39,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L 5_and X1
+L 5_and-RESCUE-c_gate X1
 U 1 1 5C9A2B0B
 P 3300 3750
 F 0 "X1" H 4650 4550 60  0000 C CNN