From: Adam Megacz <adam.megacz@sun.com>
Date: Thu, 16 Jul 2009 18:44:00 +0000 (+0000)
Subject: tinyCounter: all loads work
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=d8846a4e53d2df803d1fed3d21b4d2776edbe126;p=fleet.git

tinyCounter: all loads work
---

diff --git a/electric/tinyCounter.jelib b/electric/tinyCounter.jelib
index c686b5f..6cfe000 100644
--- a/electric/tinyCounter.jelib
+++ b/electric/tinyCounter.jelib
@@ -1,5 +1,5 @@
 # header information:
-HtinyCounter2|8.10a
+HtinyCounter|8.10a
 
 # Views:
 Vicon|ic
@@ -25,8 +25,68 @@ Ngeneric:Facet-Center|art@0||0|0||||AV
 Ngeneric:Invisible-Pin|pin@0||-5|9.5|||||ART_message(D5G3;)S["A complete counter consists of \"n\" copies of this cell","plus an \"end cap\" at the MSB end and a different \"end cap\" at the LSB end.",.,The MSB end cap ties DoneOrTwo HI and OneOrTwo LO.,.,The LSB end cap responds to decrement requests from the,"dock by draining both state wires.  It reports \"decrement succeeded\" to","the dock if the state of the LSB is \"One\" or \"Two\" and reports \"decrement","failed\" to the dock if the state of the LSB is \"Done\"."]
 X
 
+# Cell delay;1{ic}
+Cdelay;1{ic}||artwork|1021415734000|1247711830995|E|prototype_center()I[6000,0]
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NThick-Circle|art@1||2|0|1|1|||ART_color()I10
+NThick-Circle|art@2||3|0|1|1|||ART_color()I10
+NThick-Circle|art@3||10|0|1|1|||ART_color()I10
+NThick-Circle|art@4||11|0|1|1|||ART_color()I10
+NPin|pin@0||1.5|0|1|1||
+Nschematic:Bus_Pin|pin@1||-2.5|0|-2|-2||
+NPin|pin@2||-1.5|0|1|1||
+NPin|pin@3||-2.5|0||||
+Nschematic:Bus_Pin|pin@4||14.5|0|-2|-2||
+NPin|pin@5||-1.5|2|1|1||
+NPin|pin@6||-1.5|-2|1|1||
+NPin|pin@7||6.5|0|1|1||
+NPin|pin@9||3.5|2|1|1||
+NPin|pin@10||3.5|-2|1|1||
+NPin|pin@11||9.5|0|1|1||
+Nschematic:Bus_Pin|pin@12||5.5|0|-2|-2||
+NPin|pin@13||11.5|-2|1|1||
+NPin|pin@16||6.5|2|1|1||
+NPin|pin@17||6.5|-2|1|1||
+NPin|pin@18||14.5|0|1|1||
+NPin|pin@19||11.5|2|1|1||
+AThicker|net@0|||FS3263|pin@0||1.5|0|pin@5||-1.5|2|ART_color()I10
+AThicker|net@1|||FS337|pin@0||1.5|0|pin@6||-1.5|-2|ART_color()I10
+AThicker|net@2|||FS0|pin@2||-1.5|0|pin@3||-2.5|0|ART_color()I10
+AThicker|net@3|||FS2700|pin@6||-1.5|-2|pin@5||-1.5|2|ART_color()I10
+AThicker|net@4|||FS3263|pin@7||6.5|0|pin@9||3.5|2|ART_color()I10
+AThicker|net@5|||FS337|pin@7||6.5|0|pin@10||3.5|-2|ART_color()I10
+AThicker|net@6|||FS2700|pin@10||3.5|-2|pin@9||3.5|2|ART_color()I10
+AThicker|net@7|||FS3263|pin@11||9.5|0|pin@16||6.5|2|ART_color()I10
+AThicker|net@8|||FS337|pin@11||9.5|0|pin@17||6.5|-2|ART_color()I10
+AThicker|net@10|||FS2700|pin@17||6.5|-2|pin@16||6.5|2|ART_color()I10
+AThicker|net@11|||FS3263|pin@18||14.5|0|pin@19||11.5|2|ART_color()I10
+AThicker|net@12|||FS337|pin@18||14.5|0|pin@13||11.5|-2|ART_color()I10
+AThicker|net@13|||FS2700|pin@13||11.5|-2|pin@19||11.5|2|ART_color()I10
+Ein||D5G1;|pin@1||I
+Eout||D5G1;|pin@4||O
+X
+
+# Cell delay;1{sch}
+Cdelay;1{sch}||schematic|1021415734000|1247718462097||prototype_center()I[0,0]
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NOff-Page|conn@0||19|0.5||||
+NOff-Page|conn@1||-17.5|0.5||||
+Idelay;1{ic}|inv@0||25|13|||D0G4;
+IredFive:inv;1{ic}|inv@2||-11|0.5|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@3||-4|0.5|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@4||4|0.5|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@5||12|0.5|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S8|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+Awire|net@10|||0|inv@2|in|-13.5|0.5|conn@1|y|-15.5|0.5
+Awire|net@11|||0|inv@3|in|-6.5|0.5|inv@2|out|-8.5|0.5
+Awire|net@12|||0|inv@4|in|1.5|0.5|inv@3|out|-1.5|0.5
+Awire|net@13|||0|inv@5|in|9.5|0.5|inv@4|out|6.5|0.5
+Awire|net@14|||1800|inv@5|out|14.5|0.5|conn@0|a|17|0.5
+Ein||D5G2;|conn@1|a|I
+Eout||D5G2;|conn@0|y|O
+X
+
 # Cell fire;1{ic}
-Cfire;1{ic}||artwork|1247529105994|1247544514118|E
+Cfire;1{ic}||artwork|1247529105994|1247689184569|E
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NBox|art@2||-3.25|2|11.5|15||
 NThick-Circle|art@3||-7.5|-6|1|1|RRR|
@@ -49,7 +109,7 @@ Nschematic:Bus_Pin|pin@14||-11|1||||
 Nschematic:Wire_Pin|pin@15||-9|1||||
 Nschematic:Bus_Pin|pin@16||1.5|12|||R|
 Nschematic:Wire_Pin|pin@17||1.5|9.5|||R|
-Ngeneric:Invisible-Pin|pin@18||-3|2|||||ART_message(D5G2;)S12T
+Ngeneric:Invisible-Pin|pin@18||-3|2|||||ART_message(D5G2;)S16T
 Nschematic:Bus_Pin|pin@19||-7.5|-8|||RRR|
 Nschematic:Wire_Pin|pin@20||-7.5|-6.5|||RRR|
 Ngeneric:Invisible-Pin|pin@21||-7.5|-4.5|||||ART_message(D5G1;)S+1
@@ -68,6 +128,9 @@ Nschematic:Wire_Pin|pin@34||-7.5|12||||
 Nschematic:Wire_Pin|pin@35||-7.5|10.5||||
 Nschematic:Wire_Pin|pin@36||1.5|-8||||
 Ngeneric:Invisible-Pin|pin@37||-7.5|8.5|||||ART_message(D5G1;)S+1
+Nschematic:Bus_Pin|pin@38||-1.5|9.5||||
+Nschematic:Bus_Pin|pin@40||-5|9.5||||
+Nschematic:Wire_Pin|pin@41||-5|9.5||||
 Aschematic:wire|net@0|||1800|pin@1||2.5|1|pin@0||4.5|1
 Aschematic:wire|net@1|||1800|pin@3||2.5|3|pin@2||4.5|3
 Aschematic:wire|net@2|||0|pin@5||-9|3|pin@4||-11|3
@@ -82,99 +145,147 @@ Aschematic:wire|net@10|||0|pin@32||2.5|-5.5|pin@31||1.5|-5.5
 Aschematic:wire|net@11|||0|pin@34||-7.5|12|pin@33||-7.5|12
 Aschematic:wire|net@12|||900|pin@33||-7.5|12|pin@35||-7.5|10.5
 Aschematic:wire|net@13|||900|pin@31||1.5|-5.5|pin@36||1.5|-8
+Aschematic:wire|net@15|||2700|pin@41||-5|9.5|pin@40||-5|9.5
 ELSN[ZeroOrDone]||D5G2;X-9.5;|pin@0||I
-ELSN[ZeroOrOne]||D5G2;X-9.5;|pin@2||I
+ELSN[ZeroOrOne]|LSN[ZeroOrTwo]|D5G2;X-9.5;|pin@2||I
 EMSN[ZeroOrDone]||D4G2;|pin@4||I
-EMSN[ZeroOrOne]||D4G2;|pin@6||I
+EMSN[ZeroOrOne]|MSN[ZeroOrTwo]|D4G2;|pin@6||I
 ENotLSN[ZeroOrDone]||D5G2;X-11;|pin@8||I
-ENotLSN[ZeroOrOne]||D5G2;X-9.5;|pin@10||I
+ENotLSN[ZeroOrOne]|NotLSN[ZeroOrTwo]|D5G2;X-9.5;|pin@10||I
 ENotMSN[ZeroOrDone]||D4G2;|pin@12||I
-ENotMSN[ZeroOrOne]||D4G2;|pin@14||I
+ENotMSN[ZeroOrOne]|NotMSN[ZeroOrTwo]|D4G2;|pin@14||I
+Enot_disable@174670546|disable|D5G2;RX-1;Y5;|pin@40||I
 Efire|fire[1]|D5G2;X1.5;|pin@16||O
 Efire[2]||D5G2;X2;Y-3.5;|pin@31||O
+Enot_disable||D5G2;RX-0.5;Y3.5;|pin@38||I
 Enot_fire|not_fire[1]|D5G2;X1;Y-4.5;|pin@19||O
 Enot_fire[2]||D5G2;X-5.5;Y1.5;|pin@33||O
 X
 
 # Cell fire;1{sch}
-Cfire;1{sch}||schematic|1247526811643|1247544443910|
-IredFive:NMOS;1{ic}|NMOS@0||-1.5|-18|RR||D5G4;|ATTR_Delay(D5G1;NPX-4;Y-2;)I100|ATTR_X(D5G1.5;NPX-3.5;Y2;)I1
-IredFive:NMOS;1{ic}|NMOS@1||-2.5|-18|XRR||D5G4;|ATTR_Delay(D5G1;NPX-4;Y-2;)I100|ATTR_X(D5G1.5;NPX-3.5;Y2;)I1
-IredFive:PMOS;1{ic}|PMOS@0||-1.5|-1|RR||D5G4;|ATTR_Delay(D5G1;NPX-4.5;Y-1.5;)I100|ATTR_X(D5G1.5;NPX-3;Y2;)I1
-IredFive:PMOS;1{ic}|PMOS@1||-2.5|-1|XRR||D5G4;|ATTR_Delay(D5G1;NPX-3;Y-2.5;)I100|ATTR_X(D5G1.5;NPX-3;Y2;)I1
+Cfire;1{sch}||schematic|1247526811643|1247721919781|
+IredFive:NMOS;1{ic}|NMOS@0||8|-51|RR||D5G4;|ATTR_Delay(D5G1;NPX-4;Y-2;)I100|ATTR_X(D5G1.5;NPX-3.5;Y2;)S4
+IredFive:NMOS;1{ic}|NMOS@1||-1|-44.5|RR||D5G4;|ATTR_Delay(D5G1;NPX-4;Y-2;)I100|ATTR_X(D5G1.5;NPX-3.5;Y2;)S4
+IredFive:NMOS;1{ic}|NMOS@2||-14|-41.5|||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_X(D5G1.5;NPX5;Y0.5;)S4
+IredFive:NMOS;1{ic}|NMOS@5||-26|-26.5|||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_X(D5G1.5;NPX5;Y0.5;)I1
+IredFive:NMOS;1{ic}|NMOS@7||-14|-47.5|||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_X(D5G1.5;NPX5;Y0.5;)S4
+IredFive:PMOS;1{ic}|PMOS@0||-6.5|-14|RR||D5G4;|ATTR_Delay(D5G1;NPX-2.5;Y3.5;)I100|ATTR_X(D5G1.5;NPX-3;Y2;)S8
+IredFive:PMOS;1{ic}|PMOS@1||-9.5|-14|XRR||D5G4;|ATTR_Delay(D5G1;NPX-3;Y3.5;)I100|ATTR_X(D5G1.5;NPX-3;Y2;)S8
+IredFive:PMOS;1{ic}|PMOS@2||-8|-9.5|RR||D5G4;|ATTR_Delay(D5G1;NPX5.5;Y-0.5;)I100|ATTR_X(D5G1.5;NPX5.5;Y-2;)S8
+IredFive:PMOS;1{ic}|PMOS@3||-8|-4|RR||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_X(D5G1.5;NPX5;)S8
+IredFive:PMOS;1{ic}|PMOS@4||-8|2|XRR||D5G4;|ATTR_Delay(D5G1;NPX6;Y-2.5;)I100|ATTR_X(D5G1.5;NPX4.5;Y-1;)S20
 Ngeneric:Facet-Center|art@0||0|0||||AV
-NOff-Page|conn@0||-14.5|-18||||
-NOff-Page|conn@1||10.5|-18|||RR|
-NOff-Page|conn@2||10.5|-1|||RR|
-NOff-Page|conn@3||-14.5|-1||||
-NOff-Page|conn@4||10.5|3.5|||RR|
-NOff-Page|conn@5||10.5|7.5|||RR|
-NOff-Page|conn@6||-14.5|-22.5||||
-NOff-Page|conn@7||-14.5|-26.5||||
-NOff-Page|conn@8||35|-8||||
-NOff-Page|conn@9||35|-11.5||||
-NOff-Page|conn@10||35|-5.5||||
-NOff-Page|conn@11||35|-14||||
-Ifire;1{ic}|fire@0||-9|21|||D5G4;
-IredFive:inv;1{ic}|inv@0||6.5|-8|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@1||26|-11.5|||D5G4;|ATTR_Delay(D5G1;NPX1;Y-2.5;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:invI;2{ic}|invI@0||13.5|-8|||D5G4;|ATTR_Delay(D5G1;NPX1.75;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.25;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:nms2a;2{ic}|nms2a@0||-2|-26.5|||D5G4;|ATTR_Delay(D5G1;NPX3.75;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NPX-1.5;)I1
-NWire_Pin|pin@0||-2|1||||
-NWire_Pin|pin@1||-2|-16||||
-NWire_Pin|pin@2||-2|-3||||
-NWire_Pin|pin@3||-2|-20||||
-NWire_Pin|pin@5||-2|-8||||
-NWire_Pin|pin@6||21|-11.5||||
-NWire_Pin|pin@7||21|-8||||
-NWire_Pin|pin@8||31|-5.5||||
-NWire_Pin|pin@9||31|-8||||
-NWire_Pin|pin@10||31|-14||||
-NWire_Pin|pin@11||31|-11.5||||
-IredFive:pms2a;2{ic}|pms2a@0||-2|7.5|X||D5G4;|ATTR_Delay(D5G1;NPX-2;Y0.25;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y2.75;)S1
-Awire|net@0|||1800|PMOS@1|d|-2.5|1|pin@0||-2|1
-Awire|net@1|||1800|pin@0||-2|1|PMOS@0|d|-1.5|1
-Awire|net@2|||2700|nms2a@0|d|-2|-20.5|pin@3||-2|-20
-Awire|net@3|||900|pms2a@0|d|-2|1.5|pin@0||-2|1
-Awire|net@4|||1800|NMOS@1|s|-2.5|-16|pin@1||-2|-16
-Awire|net@5|||1800|pin@1||-2|-16|NMOS@0|s|-1.5|-16
-Awire|net@6|||1800|PMOS@1|s|-2.5|-3|pin@2||-2|-3
-Awire|net@7|||1800|pin@2||-2|-3|PMOS@0|s|-1.5|-3
-Awire|net@9|||1800|NMOS@1|d|-2.5|-20|pin@3||-2|-20
-Awire|net@10|||1800|pin@3||-2|-20|NMOS@0|d|-1.5|-20
-Awire|net@12|||1800|conn@0|y|-12.5|-18|NMOS@1|g|-5.5|-18
-Awire|net@13|||0|conn@1|y|8.5|-18|NMOS@0|g|1.5|-18
-Awire|net@14|||0|conn@2|y|8.5|-1|PMOS@0|g|1.5|-1
-Awire|net@15|||1800|conn@3|y|-12.5|-1|PMOS@1|g|-5.5|-1
-Awire|net@16|||0|conn@4|y|8.5|3.5|pms2a@0|g2|1|3.5
-Awire|net@17|||0|conn@5|y|8.5|7.5|pms2a@0|g|1|7.5
-Awire|net@18|||1800|conn@6|y|-12.5|-22.5|nms2a@0|g2|-5|-22.5
-Awire|net@19|||1800|conn@7|y|-12.5|-26.5|nms2a@0|g|-5|-26.5
-Awire|net@24|||0|invI@0|in|11|-8|inv@0|out|9|-8
-Awire|net@25|||2700|pin@1||-2|-16|pin@5||-2|-8
-Awire|net@26|||2700|pin@5||-2|-8|pin@2||-2|-3
-Awire|net@27|||0|inv@0|in|4|-8|pin@5||-2|-8
-Awire|net@29|||0|inv@1|in|23.5|-11.5|pin@6||21|-11.5
-Awire|net@30|||1800|invI@0|out|16|-8|pin@7||21|-8
-Awire|net@32|||2700|pin@6||21|-11.5|pin@7||21|-8
-Awire|net@34|||0|conn@10|a|33|-5.5|pin@8||31|-5.5
-Awire|net@35|||1800|pin@7||21|-8|pin@9||31|-8
-Awire|net@36|||1800|pin@9||31|-8|conn@8|a|33|-8
-Awire|net@37|||900|pin@8||31|-5.5|pin@9||31|-8
-Awire|net@38|||0|conn@11|a|33|-14|pin@10||31|-14
-Awire|net@39|||0|conn@9|a|33|-11.5|pin@11||31|-11.5
-Awire|net@40|||0|pin@11||31|-11.5|inv@1|out|28.5|-11.5
-Awire|net@41|||2700|pin@10||31|-14|pin@11||31|-11.5
+NOff-Page|conn@0||-50.5|-38||||
+NOff-Page|conn@1||22.5|-37|||RR|
+NOff-Page|conn@2||4.5|-14|||RR|
+NOff-Page|conn@3||-20.5|-14||||
+NOff-Page|conn@4||4.5|-9.5|||RR|
+NOff-Page|conn@5||4.5|-4|||RR|
+NOff-Page|conn@6||-50.5|-42.5||||
+NOff-Page|conn@7||-50.5|-46.5||||
+NOff-Page|conn@8||29|-21||||
+NOff-Page|conn@9||29|-24.5||||
+NOff-Page|conn@10||29|-18.5||||
+NOff-Page|conn@11||29|-27||||
+NOff-Page|conn@12||-58.5|2.5||||
+NOff-Page|conn@14||-56|-26.5|||XRR|
+Ifire;1{ic}|fire@0||-57|22|||D5G4;
+NGround|gnd@1||-26|-32.5||||
+NGround|gnd@2||-8|-61||||
+IredFive:inv;1{ic}|inv@1||20|-24.5|||D5G4;|ATTR_Delay(D5G1;NPX1;Y-2.5;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPY-4.5;)S8|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+NWire_Pin|pin@0||-8|-12||||
+NWire_Pin|pin@2||-8|-16||||
+NWire_Pin|pin@5||-8|-21||||
+NWire_Pin|pin@6||15|-24.5||||
+NWire_Pin|pin@7||15|-21||||
+NWire_Pin|pin@8||25|-18.5||||
+NWire_Pin|pin@9||25|-21||||
+NWire_Pin|pin@10||25|-27||||
+NWire_Pin|pin@11||25|-24.5||||
+NWire_Pin|pin@12||-8|-11.5||||
+NWire_Pin|pin@18||-26|-21||||
+NWire_Pin|pin@19||-45.5|2||||
+NWire_Pin|pin@20||-45.5|-26.5||||
+NWire_Pin|pin@21||24|-44.5|||X|
+NWire_Pin|pin@22||26|-51||||
+NWire_Pin|pin@23||-39.5|-41.5||||
+NWire_Pin|pin@26||-32|-47.5||||
+NWire_Pin|pin@29||8|-56||||
+NWire_Pin|pin@31||-14|-33.5||||
+NWire_Pin|pin@32||8|-33.5||||
+NWire_Pin|pin@33||-8|-33.5||||
+NWire_Pin|pin@34||-14|-56||||
+NWire_Pin|pin@35||-8|-56||||
+NWire_Pin|pin@38||-1|-56||||
+NWire_Pin|pin@39||-1|-33.5||||
+NWire_Pin|pin@40||9|-21||||
+NWire_Pin|pin@41||-3|-21||||
+NPower|pwr@0||-8|6.5||||
+Awire|MSN[ZeroOrDone]|D5G2;X-6;||0|NMOS@7|g|-17|-47.5|pin@26||-32|-47.5
+Awire|MSN[ZeroOrTwo]|D5G2;X-6;||0|NMOS@2|g|-17|-41.5|pin@23||-39.5|-41.5
+Awire|NotLSN[ZeroOrDone]|D5G2;X6;||1800|NMOS@0|g|11|-51|pin@22||26|-51
+Awire|NotLSN[ZeroOrTwo]|D5G2;X8.5;||1800|NMOS@1|g|2|-44.5|pin@21||24|-44.5
+Awire|net@0|||1800|PMOS@1|d|-9.5|-12|pin@0||-8|-12
+Awire|net@1|||1800|pin@0||-8|-12|PMOS@0|d|-6.5|-12
+Awire|net@6|||1800|PMOS@1|s|-9.5|-16|pin@2||-8|-16
+Awire|net@7|||1800|pin@2||-8|-16|PMOS@0|s|-6.5|-16
+Awire|net@14|||0|conn@2|y|2.5|-14|PMOS@0|g|-3.5|-14
+Awire|net@15|||1800|conn@3|y|-18.5|-14|PMOS@1|g|-12.5|-14
+Awire|net@26|||2700|pin@5||-8|-21|pin@2||-8|-16
+Awire|net@29|||0|inv@1|in|17.5|-24.5|pin@6||15|-24.5
+Awire|net@32|||2700|pin@6||15|-24.5|pin@7||15|-21
+Awire|net@34|||0|conn@10|a|27|-18.5|pin@8||25|-18.5
+Awire|net@35|||1800|pin@7||15|-21|pin@9||25|-21
+Awire|net@36|||1800|pin@9||25|-21|conn@8|a|27|-21
+Awire|net@37|||900|pin@8||25|-18.5|pin@9||25|-21
+Awire|net@38|||0|conn@11|a|27|-27|pin@10||25|-27
+Awire|net@39|||0|conn@9|a|27|-24.5|pin@11||25|-24.5
+Awire|net@40|||0|pin@11||25|-24.5|inv@1|out|22.5|-24.5
+Awire|net@41|||2700|pin@10||25|-27|pin@11||25|-24.5
+Awire|net@42|||2700|pin@0||-8|-12|pin@12||-8|-11.5
+Awire|net@45|||900|PMOS@2|s|-8|-11.5|pin@0||-8|-12
+Awire|net@46|||900|PMOS@3|s|-8|-6|PMOS@2|d|-8|-7.5
+Awire|net@47|||900|PMOS@4|s|-8|0|PMOS@3|d|-8|-2
+Awire|net@51|||1800|PMOS@2|g|-5|-9.5|conn@4|y|2.5|-9.5
+Awire|net@52|||1800|PMOS@3|g|-5|-4|conn@5|y|2.5|-4
+Awire|net@53|||900|pwr@0||-8|6.5|PMOS@4|d|-8|4
+Awire|net@65|||2700|gnd@1||-26|-30.5|NMOS@5|s|-26|-28.5
+Awire|net@66|||2700|NMOS@5|d|-26|-24.5|pin@18||-26|-21
+Awire|net@67|||0|pin@5||-8|-21|pin@18||-26|-21
+Awire|net@69|||0|PMOS@4|g|-11|2|pin@19||-45.5|2
+Awire|net@70|||1800|conn@14|y|-54|-26.5|pin@20||-45.5|-26.5
+Awire|net@71|||1800|pin@20||-45.5|-26.5|NMOS@5|g|-29|-26.5
+Awire|net@72|||900|pin@19||-45.5|2|pin@20||-45.5|-26.5
+Awire|net@78|||2700|pin@29||8|-56|NMOS@0|d|8|-53
+Awire|net@86|||1800|pin@31||-14|-33.5|pin@33||-8|-33.5
+Awire|net@89|||2700|pin@33||-8|-33.5|pin@5||-8|-21
+Awire|net@90|||900|NMOS@7|s|-14|-49.5|pin@34||-14|-56
+Awire|net@95|||900|pin@35||-8|-56|gnd@2||-8|-59
+Awire|net@96|||1800|pin@34||-14|-56|pin@35||-8|-56
+Awire|net@105|||900|NMOS@2|s|-14|-43.5|NMOS@7|d|-14|-45.5
+Awire|net@106|||2700|NMOS@2|d|-14|-39.5|pin@31||-14|-33.5
+Awire|net@107|||0|pin@29||8|-56|pin@38||-1|-56
+Awire|net@108|||0|pin@38||-1|-56|pin@35||-8|-56
+Awire|net@109|||900|NMOS@1|d|-1|-46.5|pin@38||-1|-56
+Awire|net@110|||1800|pin@33||-8|-33.5|pin@39||-1|-33.5
+Awire|net@111|||1800|pin@39||-1|-33.5|pin@32||8|-33.5
+Awire|net@112|||2700|NMOS@1|s|-1|-42.5|pin@39||-1|-33.5
+Awire|net@113|||2700|NMOS@0|s|8|-49|pin@32||8|-33.5
+Awire|net@114|||0|pin@7||15|-21|pin@40||9|-21
+Awire|net@115|||1800|pin@5||-8|-21|pin@41||-3|-21
+Awire|net@116|||1800|pin@41||-3|-21|pin@40||9|-21
 ENotLSN[ZeroOrDone]|LSN[ZeroOrDone]|D6G2;X-16.5;|conn@1|a|I
-ENotLSN[ZeroOrOne]|LSN[ZeroOrOne]|D6G2;X-19.5;|conn@0|y|I
+ENotLSN[ZeroOrOne]|LSN[ZeroOrTwo]|D6G2;X-19.5;|conn@0|y|I
 EMSN[ZeroOrDone]||D4G2;|conn@2|a|I
-EMSN[ZeroOrOne]||D6G2;X-20;|conn@3|y|I
+EMSN[ZeroOrOne]|MSN[ZeroOrTwo]|D6G2;X-20;|conn@3|y|I
 ENotLSN[ZeroOrDone]@143472236|NotLSN[ZeroOrDone]|D4G2;|conn@4|a|I
-ENotLSN[ZeroOrOne]@693077187|NotLSN[ZeroOrOne]|D4G2;|conn@5|a|I
+ENotLSN[ZeroOrOne]@693077187|NotLSN[ZeroOrTwo]|D4G2;|conn@5|a|I
 ENotMSN[ZeroOrDone]||D6G2;X-20.5;|conn@7|a|I
-ENotMSN[ZeroOrOne]||D5G2;X-10;|conn@6|a|I
+ENotMSN[ZeroOrOne]|NotMSN[ZeroOrTwo]|D5G2;X-10;|conn@6|a|I
+Enot_disable@228418395|disable|D5G2;X-4;|conn@14|a|I
 Efire|fire[1]|D6G2;X4.5;|conn@8|a|O
 Efire[2]||D5G2;X7;|conn@10|a|O
+Enot_disable||D5G2;X-6;|conn@12|a|I
 Enot_fire|not_fire[1]|D5G2;X9;|conn@9|a|O
 Enot_fire[2]||D5G2;X5;|conn@11|y|O
 X
@@ -302,11 +413,10 @@ EoutaBar||D5G2;X7.5;|conn@3|a|U
 X
 
 # Cell oneBit;1{ic}
-ConeBit;1{ic}||artwork|1242937501096|1247530698535|E
+ConeBit;1{ic}||artwork|1242937501096|1247628024012|E
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NTriangle|art@2||-5|2|3|2|RRR|
-NTriangle|art@3||3|-8|3|2|R|
-NTriangle|art@4||3|2|3|2|R|
+NTriangle|art@3||-5|-8|3|2|RRR|
 NPin|pin@0||-6|4|1|1||
 NPin|pin@1||-6|-10|1|1||
 NPin|pin@2||4|-10|1|1||
@@ -315,158 +425,260 @@ Nschematic:Wire_Pin|pin@9||-6|2||||
 Nschematic:Wire_Pin|pin@16||4|2||||
 Nschematic:Wire_Pin|pin@17||4|-8||||
 Nschematic:Wire_Pin|pin@18||-6|-8||||
-Nschematic:Wire_Pin|pin@19||-1|-10||||
-NPin|pin@20||-6|-8|1|1||
-Nschematic:Bus_Pin|pin@21||-6|-3||||
-Nschematic:Wire_Pin|pin@22||-4|-3||||
-Nschematic:Bus_Pin|pin@23||5|-7||||
-Nschematic:Wire_Pin|pin@24||3|-7||||
-Nschematic:Bus_Pin|pin@25||6|-6||||
-Nschematic:Wire_Pin|pin@26||4|-6||||
-Nschematic:Bus_Pin|pin@27||7|-8||||
-Nschematic:Wire_Pin|pin@28||5|-8||||
-Nschematic:Bus_Pin|pin@29||2|-10.5||||
+NPin|pin@20||4|-8|1|1||
+Nschematic:Bus_Pin|pin@29||2|-11.5||||
 Nschematic:Wire_Pin|pin@30||2|-8.5||||
-Nschematic:Bus_Pin|pin@31||2|-11.5||||
-Nschematic:Wire_Pin|pin@32||2|-9.5||||
+Nschematic:Bus_Pin|pin@31||-4.5|-11.5||||
+Nschematic:Wire_Pin|pin@32||-4.5|-9.5||||
+NPin|pin@33||4|2|1|1||
+Nschematic:Bus_Pin|pin@36||2|6||||
+Nschematic:Wire_Pin|pin@37||2|4||||
+Nschematic:Bus_Pin|pin@38||-4|6||||
+Nschematic:Wire_Pin|pin@39||-4|4||||
 ASolid|net@0|||FS900|pin@0||-6|4|pin@1||-6|-10
 ASolid|net@1|||FS1800|pin@1||-6|-10|pin@2||4|-10
 ASolid|net@2|||FS2700|pin@2||4|-10|pin@3||4|4
 ASolid|net@3|||FS0|pin@3||4|4|pin@0||-6|4
-Aschematic:wire|net@4|||0|pin@22||-4|-3|pin@21||-6|-3
-Aschematic:wire|net@5|||1800|pin@24||3|-7|pin@23||5|-7
-Aschematic:wire|net@6|||1800|pin@26||4|-6|pin@25||6|-6
-Aschematic:wire|net@7|||1800|pin@28||5|-8|pin@27||7|-8
-Aschematic:wire|net@8|||900|pin@30||2|-8.5|pin@29||2|-10.5
-Aschematic:wire|net@9|||900|pin@32||2|-9.5|pin@31||2|-11.5
-Esucc[OneOrTwo]|LSN[ZeroOrDone]|D5G1;X2;|pin@17||B
-Esucc[TwoOrEmpty]|LSN[ZeroOrOne]|D6G1;X1;|pin@16||B
+Aschematic:wire|net@8|||900|pin@30||2|-8.5|pin@29||2|-11.5
+Aschematic:wire|net@9|||900|pin@32||-4.5|-9.5|pin@31||-4.5|-11.5
+Aschematic:wire|net@11|||2700|pin@37||2|4|pin@36||2|6
+Aschematic:wire|net@12|||2700|pin@39||-4|4|pin@38||-4|6
+Esucc[OneOrTwo]|LSN[ZeroOrDone]|D5G1;X5;|pin@17||B
+Esucc[TwoOrEmpty]|LSN[ZeroOrTwo]|D6G1;X1;|pin@16||B
 Epred[OneOrTwo]|MSN[ZeroOrDone]|D4G1;X-1;|pin@18||B
-Epred[TwoOrEmpty]|MSN[ZeroOrOne]|D4G1;X-1;|pin@9||B
-Eload||D5G2;|pin@27||U
-EloadBar||D5G2;|pin@25||U
-EloadVal|loadValBar|D5G2;|pin@23||U
-Eload_one||D5G2;|pin@29||I
-Emc||D5G1;Y-1;|pin@19||I
-Eload_or_master_clear|not_load_or_master_clear|D5G2;|pin@21||I
-Enot_load_zero||D5G2;|pin@31||I
+Epred[TwoOrEmpty]|MSN[ZeroOrTwo]|D4G1;X-1;|pin@9||B
+Edisable||D5G2;X-2.5;|pin@38||I
+Eload_one||D5G2;X2.5;Y-0.5;|pin@29||I
+Enot_disable||D5G2;X4.5;|pin@36||I
+Enot_load_zero||D5G2;X-5.5;Y-0.5;|pin@31||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1247544330841|
+ConeBit;1{sch}||schematic|1242942044308|1247769751415|
 Ngeneric:Facet-Center|art@0||0|0||||AV
-NOff-Page|conn@0||-10.5|28||||
-NOff-Page|conn@1||-57.5|30|||RR|
-NOff-Page|conn@2||-57.5|66||||
-NOff-Page|conn@3||-10|66.5||||
-NOff-Page|conn@6||-24|73||||
-NOff-Page|conn@10||-25|24.5||||
-NOff-Page|conn@11||-25|22||||
-Ifire;1{ic}|fire@0||-28|45|||D5G4;
-Ngeneric:Invisible-Pin|pin@6||-72|103|||||ART_message(D5G15;)SoneBit
-Ngeneric:Invisible-Pin|pin@149||-72.5|92.5|||||ART_message(D5G2;)Sam 13 Jul 2009
-Ngeneric:Invisible-Pin|pin@162||-9|97|||||ART_message(D5G3;)S[Each bit of the counter has four states:,"Zero, One, Two, Done",.,These states are encoded by two state wires:,"ZeroOrOne is HI if the state is \"Zero\" or \"One\"","ZeroOrDone is HI if the state is \"Zero\" or \"Done\""]
-Ngeneric:Invisible-Pin|pin@194||-78.5|48.5|||||ART_message(D5G4;)SMSB to the Left
-Ngeneric:Invisible-Pin|pin@195||5|48|||||ART_message(D5G4;)SLSB to the Right
-Ngeneric:Invisible-Pin|pin@196||-71.5|95|||||ART_message(D5G2;)S"this GasP module sits \"between\" two bits"
-Ngeneric:Invisible-Pin|pin@226||-85|82|||||ART_message(D6FMonospaced;G2;)S[Ye Olde Firing Rules:,* Fire when there is a non-Zero on the left and a Zero on the right,"-   If there was a Two  on the left, we want to leave One  on the left and Two  on the right","-   If there was a One  on the left, we want to leave Zero on the left and Two  on the right","-   If there was a Done on the left, we want to leave Done on the left and Done on the right"]
-Ngeneric:Invisible-Pin|pin@227||-59|36|||||ART_message(D4G1.5;)S[filled if there wasn't a Two on the left before firing,"already full if there was a Done on the left, so",(equivalently: if there was a One on the left before firing),"(equivalently: if MSN[ZeroOrOne] was full before firing)"]
-Ngeneric:Invisible-Pin|pin@228||-58.5|61|||||ART_message(D4G1.5;)S[filled if there was a Two on the left before firing,"(equivalently: if MSN[ZeroOrDone] was empty before firing)"]
-Ngeneric:Invisible-Pin|pin@229||-12.5|32.5|||||ART_message(D6G1.5;)S[drained if there wasn't a Done on the left before firing,(equivalently: if there wasn't a Done on the left AFTER firing),"(equivalently: if MSN[ZeroOrOne] was full after firing)"]
-Ngeneric:Invisible-Pin|pin@230||-13|62.5|||||ART_message(D6G1.5;)S[drained unconditionally,(we only leave Done's and Two's on the right)]
-NWire_Pin|pin@270||-19.5|73||||
-NWire_Pin|pin@280||-19|24.5||||
-NWire_Pin|pin@281||-17.5|22||||
-NWire_Pin|pin@293||-51.5|66||||
-NWire_Pin|pin@296||-51.5|30||||
-NWire_Pin|pin@299||-43.25|65||||
-NWire_Pin|pin@305||-14|46||||
-NWire_Pin|pin@308||-14|28||||
-NWire_Pin|pin@312||-14|66.5||||
-NWire_Pin|pin@320||-47.25|46||||
-NWire_Pin|pin@321||-43.25|31||||
-NWire_Pin|pin@322||-47.25|44||||
-NWire_Pin|pin@327||-20|50||||
-NWire_Pin|pin@330||-19.5|44||||
-NWire_Pin|pin@335||-14|48||||
-NWire_Pin|pin@337||-35.5|29||||
-NWire_Pin|pin@338||-26.5|66.5||||
-NWire_Pin|pin@343||-26.5|29||||
-NWire_Pin|pin@344||-35.5|67||||
-NWire_Pin|pin@350||-43.25|46||||
-NWire_Pin|pin@351||-51.5|48||||
-NWire_Pin|pin@352||-43.25|48||||
-NWire_Pin|pin@353||-51.5|50||||
-NWire_Pin|pin@354||-41|50||||
-NWire_Pin|pin@355||-41|27||||
-IpredCondMSC;1{ic}|predCond@3||-18|28|||D5G4;
-IpredMS;1{ic}|predMS@0||-18.5|66.5|Y||D5G4;
-IsuccCond;1{ic}|sucDri20@0||-48|30|RR||D5G4;
-IsuccCond;1{ic}|sucDri20@1||-48|66|YRR||D5G4;
-Awire|net@577|||1800|conn@6|y|-22|73|pin@270||-19.5|73
-Awire|net@578|||2700|predMS@0|MC|-19.5|69.5|pin@270||-19.5|73
-Awire|net@597|||1800|conn@10|y|-23|24.5|pin@280||-19|24.5
-Awire|net@598|||900|predCond@3|mc|-19|25|pin@280||-19|24.5
-Awire|net@599|||1800|conn@11|y|-23|22|pin@281||-17.5|22
-Awire|net@600|||900|predCond@3|NotMS|-17.5|25|pin@281||-17.5|22
-Awire|net@627|||0|sucDri20@1|succ|-50|66|pin@293||-51.5|66
-Awire|net@632|||0|sucDri20@0|succ|-50|30|pin@296||-51.5|30
-Awire|net@633|||0|pin@296||-51.5|30|conn@1|a|-55.5|30
-Awire|net@636|||1800|sucDri20@1|cond|-46|65|pin@299||-43.25|65
-Awire|net@649|||1800|fire@0|LSN[ZeroOrDone]|-23.5|46|pin@305||-14|46
-Awire|net@652|||1800|predCond@3|state[1]|-15.5|28|pin@308||-14|28
-Awire|net@653|||1800|pin@308||-14|28|conn@0|a|-12.5|28
-Awire|net@658|||1800|predMS@0|state|-16|66.5|pin@312||-14|66.5
-Awire|net@659|||1800|pin@312||-14|66.5|conn@3|a|-12|66.5
-Awire|net@678|||0|pin@321||-43.25|31|sucDri20@0|cond|-46|31
-Awire|net@679|||2700|sucDri20@0|not_succ|-47.25|34|pin@322||-47.25|44
-Awire|net@680|||1800|pin@322||-47.25|44|fire@0|NotMSN[ZeroOrDone]|-39|44
-Awire|net@688|||0|pin@327||-20|50|fire@0|NotLSN[ZeroOrOne]|-23.5|50
-Awire|net@692|||0|pin@330||-19.5|44|fire@0|NotLSN[ZeroOrDone]|-23.5|44
-Awire|net@699|||1800|fire@0|LSN[ZeroOrOne]|-23.5|48|pin@335||-14|48
-Awire|net@703|||2700|pin@337||-35.5|29|fire@0|not_fire|-35.5|37
-Awire|net@704|||2700|fire@0|fire|-26.5|57|pin@338||-26.5|66.5
-Awire|net@715|||1800|sucDri20@0|in|-46|29|pin@337||-35.5|29
-Awire|net@717|||900|fire@0|fire[2]|-26.5|39.5|pin@343||-26.5|29
-Awire|net@719|||2700|fire@0|not_fire[2]|-35.5|57|pin@344||-35.5|67
-Awire|net@721|||1800|pin@338||-26.5|66.5|predMS@0|in|-21|66.5
-Awire|net@730|||0|pin@344||-35.5|67|sucDri20@1|in|-46|67
-Awire|net@731|||2700|pin@327||-20|50|predMS@0|not_state|-20|62.5
-Awire|net@733|||900|sucDri20@1|not_succ|-47.25|62|pin@320||-47.25|46
-Awire|net@734|||1800|pin@320||-47.25|46|pin@350||-43.25|46
-Awire|net@735|||1800|pin@350||-43.25|46|fire@0|NotMSN[ZeroOrOne]|-39|46
-Awire|net@736|||2700|pin@321||-43.25|31|pin@350||-43.25|46
-Awire|net@737|||2700|pin@296||-51.5|30|pin@351||-51.5|48
-Awire|net@740|||0|fire@0|MSN[ZeroOrDone]|-39|48|pin@352||-43.25|48
-Awire|net@741|||0|pin@352||-43.25|48|pin@351||-51.5|48
-Awire|net@742|||900|pin@299||-43.25|65|pin@352||-43.25|48
-Awire|net@745|||900|pin@293||-51.5|66|pin@353||-51.5|50
-Awire|net@746|||0|pin@293||-51.5|66|conn@2|y|-55.5|66
-Awire|net@748|||0|pin@354||-41|50|pin@353||-51.5|50
-Awire|net@749|||0|predCond@3|cond|-20.5|27|pin@355||-41|27
-Awire|net@751|||900|pin@354||-41|50|pin@355||-41|27
-Awire|net@754|||0|predCond@3|in[1]|-21|29|pin@343||-26.5|29
-Awire|net@755|||0|fire@0|MSN[ZeroOrOne]|-39|50|pin@354||-41|50
-Awire|net@757|||2700|pin@308||-14|28|pin@305||-14|46
-Awire|net@758|||900|pin@330||-19.5|44|predCond@3|not_state|-19.5|32
-Awire|net@759|||2700|pin@335||-14|48|pin@312||-14|66.5
+NOff-Page|conn@0||-1.5|19||||
+NOff-Page|conn@1||-84|21|||RR|
+NOff-Page|conn@2||-83|50.5||||
+NOff-Page|conn@3||-1|62||||
+NOff-Page|conn@4||-78.5|69||||
+NOff-Page|conn@5||-78.5|66||||
+NOff-Page|conn@6||-36.5|74||||
+NOff-Page|conn@7||-36.5|71.5||||
+Idelay;1{ic}|delay@0||-70.5|16|RRR||D5G4;
+Idelay;1{ic}|delay@1||-70.5|55|R||D5G4;
+Idelay;1{ic}|delay@3||-59.5|31|R||D5G4;
+Idelay;1{ic}|delay@5||-70.5|77|R||D5G4;
+Ifire;1{ic}|fire@0||-28|36|||D5G4;
+IredFive:inv;1{ic}|inv@2||-65.5|25.5|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@9||-61|8.5|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@10||-54|8.5|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nms1;2{ic}|nms1@0||-9.5|14|||D5G4;|ATTR_Delay(D5G1;NPX3.75;Y-0.25;)I100|ATTR_X(D5FLeave alone;G1.5;NPX-5;Y-3.25;)S8
+IredFive:nms1;2{ic}|nms1@1||-9.5|48|X||D5G4;|ATTR_Delay(D5G1;NPX-2.75;Y-1.25;)I100|ATTR_X(D5FLeave alone;G1.5;NPX-1.5;Y2.75;)S8
+IredFive:nor2n;1{ic}|nor2n@0||-76|25.5|||D5G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX2.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IoneBit;1{ic}|oneBit@0||40|73|||D5G4;
+Ngeneric:Invisible-Pin|pin@6||-72|145|||||ART_message(D5G15;)SoneBit
+Ngeneric:Invisible-Pin|pin@149||-72.5|134.5|||||ART_message(D5G2;)Sam 13 Jul 2009
+Ngeneric:Invisible-Pin|pin@162||-9|139|||||ART_message(D5G3;)S[Each bit of the counter has four states:,"Zero, One, Two, Done",.,These states are encoded by two state wires:,"ZeroOrTwo is HI if the state is \"Zero\" or \"Two\"","ZeroOrDone is HI if the state is \"Zero\" or \"Done\""]
+Ngeneric:Invisible-Pin|pin@194||-102|39.5|||||ART_message(D5G4;)SMSB to the Left
+Ngeneric:Invisible-Pin|pin@195||14|39|||||ART_message(D5G4;)SLSB to the Right
+Ngeneric:Invisible-Pin|pin@196||-71.5|137|||||ART_message(D5G2;)S"this GasP module sits \"between\" two bits"
+Ngeneric:Invisible-Pin|pin@226||-85|124|||||ART_message(D6FMonospaced;G2;)S[Ye Olde Firing Rules:,* Fire when there is a non-Zero on the left and a Zero on the right,"-   If there was a Two  on the left, we want to leave One  on the left and Two  on the right","-   If there was a One  on the left, we want to leave Zero on the left and Two  on the right","-   If there was a Done on the left, we want to leave Done on the left and Done on the right"]
+Ngeneric:Invisible-Pin|pin@227||-86.5|24|||||ART_message(D4G1.5;)S[filled if there wasn't a two on the left before firing,"(equivalently: if MSN[ZeroOrTwo] was empty before firing)"]
+Ngeneric:Invisible-Pin|pin@228||-87.5|47|||||ART_message(D4G1.5;)S[filled if there was a One on the left before firing,drained if there was a Two on the left before firing]
+Ngeneric:Invisible-Pin|pin@229||0.5|23.5|||||ART_message(D6G1.5;)S[drained if there wasn't a Done on the left before firing,(equivalently: if there was a One or Two on the left before firing),"(equivalently: if MSN[ZeroOrDone] was empty before firing)",ideally: if there is a One or a Zero on the left AFTER firing (hard)]
+Ngeneric:Invisible-Pin|pin@230||-3|54.5|||||ART_message(D6G1.5;)S[drained if there was a Done on the left before firing,(equvialently: if MSN[ZeroOrDone was full before firing)]
+NWire_Pin|pin@293||-53|50.5||||
+NWire_Pin|pin@296||-53|21||||
+NWire_Pin|pin@305||-14|37||||
+NWire_Pin|pin@308||-14|19||||
+NWire_Pin|pin@312||-14|62||||
+NWire_Pin|pin@320||-47.25|37||||
+NWire_Pin|pin@322||-47.25|35||||
+NWire_Pin|pin@330||-19.5|35||||
+NWire_Pin|pin@335||-14|39||||
+NWire_Pin|pin@337||-35.5|20||||
+NWire_Pin|pin@343||-26.5|20||||
+NWire_Pin|pin@344||-35.5|51.5||||
+NWire_Pin|pin@351||-53|39||||
+NWire_Pin|pin@353||-53|41||||
+NWire_Pin|pin@360||-19.5|41||||
+NWire_Pin|pin@361||-26.5|61||||
+NWire_Pin|pin@367||-9.5|62||||
+NWire_Pin|pin@368||-20|68||||
+NWire_Pin|pin@369||-9.5|19||||
+NWire_Pin|pin@370||2|30||||
+NWire_Pin|pin@371||-22.5|14||||
+NWire_Pin|pin@372||7.5|48||||
+NWire_Pin|pin@373||-33|71||||
+NWire_Pin|pin@374||-29.5|74.5||||
+NWire_Pin|pin@375||-39|18||||
+NWire_Pin|pin@376||-39|35||||
+NWire_Pin|pin@380||-53|58||||
+NWire_Pin|pin@381||-47|54||||
+NWire_Pin|pin@384||-58.5|71.5||||
+NWire_Pin|pin@385||-43.5|71.5||||
+NWire_Pin|pin@386||-43.5|59||||
+NWire_Pin|pin@387||-79.5|50.5||||
+NWire_Pin|pin@388||-79.5|39||||
+NWire_Pin|pin@389||-79.5|26.5||||
+NWire_Pin|pin@390||-79.5|24.5||||
+NWire_Pin|pin@391||-79.5|21||||
+NWire_Pin|pin@395||-41.5|49||||
+NWire_Pin|pin@396||-46|49||||
+NWire_Pin|pin@397||-41.5|49.5||||
+NWire_Pin|pin@398||-26.5|57||||
+NWire_Pin|pin@401||-33|71.5||||
+NWire_Pin|pin@402||-29.5|74||||
+NWire_Pin|pin@418||-70.5|50.5||||
+NWire_Pin|pin@419||-70.5|71.5||||
+NWire_Pin|pin@423||-43.5|68.5||||
+NWire_Pin|pin@433||-59.5|25.5||||
+NWire_Pin|pin@434||-59.5|46.5||||
+NWire_Pin|pin@435||-41.5|46.5||||
+NWire_Pin|pin@439||-61.5|25.5||||
+NWire_Pin|pin@440||-61.5|14.5||||
+NWire_Pin|pin@441||-66|14.5||||
+NWire_Pin|pin@442||-66|8||||
+NWire_Pin|pin@443||-63.5|8||||
+NWire_Pin|pin@444||-49|8.5||||
+NWire_Pin|pin@445||-49|12.5||||
+NWire_Pin|pin@446||-59|12.5||||
+NWire_Pin|pin@447||-59.5|12.5||||
+NWire_Pin|pin@448||-70.5|21||||
+NWire_Pin|pin@449||-70.5|-21.5||||
+NWire_Pin|pin@450||-24.5|-21.5||||
+NWire_Pin|pin@451||-24.5|63.5||||
+NWire_Pin|pin@452||-20.5|63.5||||
+NWire_Pin|pin@455||-70.5|96||||
+NWire_Pin|pin@456||-41|96||||
+NWire_Pin|pin@457||-41|22||||
+IredFive:pms1;2{ic}|pms1@0||-9.5|68|||D5G4;|ATTR_Delay(D5G1;NPX-2;Y-1.5;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y1;)S8
+IredFive:pms1;2{ic}|pms1@1||-9.5|30|X||D5G4;|ATTR_Delay(D5G1;NPX-2;Y-1.5;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX-2.75;Y3;)S8
+IpredCondMSC;1{ic}|predCond@3||-18|19|||D5G4;
+IpredCondMSC;1{ic}|predCond@4||-18|62|Y||D5G4;
+IpredCondMSC;1{ic}|predCond@5||-48.5|58|RR||D5G4;
+IsuccCond;1{ic}|sucDri20@0||-48|21|RR||D5G4;
+IsuccCond;1{ic}|sucDri20@1||-48|50.5|YRR||D5G4;
+Awire|load_one|D5G2;||0|nms1@0|g|-12.5|14|pin@371||-22.5|14
+Awire|load_one|D5G2;X4;||1800|nms1@1|g|-6.5|48|pin@372||7.5|48
+Awire|net@627|||0|sucDri20@1|succ|-50|50.5|pin@293||-53|50.5
+Awire|net@632|||0|sucDri20@0|succ|-50|21|pin@296||-53|21
+Awire|net@649|||1800|fire@0|LSN[ZeroOrDone]|-23.5|37|pin@305||-14|37
+Awire|net@652|||1800|predCond@3|state[1]|-15.5|19|pin@308||-14|19
+Awire|net@679|||2700|sucDri20@0|not_succ|-47.25|25|pin@322||-47.25|35
+Awire|net@692|||0|pin@330||-19.5|35|fire@0|NotLSN[ZeroOrDone]|-23.5|35
+Awire|net@699|||1800|fire@0|LSN[ZeroOrOne]|-23.5|39|pin@335||-14|39
+Awire|net@703|||2700|pin@337||-35.5|20|fire@0|not_fire|-35.5|28
+Awire|net@715|||1800|sucDri20@0|in|-46|20|pin@337||-35.5|20
+Awire|net@717|||900|fire@0|fire[2]|-26.5|30.5|pin@343||-26.5|20
+Awire|net@719|||2700|fire@0|not_fire[2]|-35.5|48|pin@344||-35.5|51.5
+Awire|net@730|||0|pin@344||-35.5|51.5|sucDri20@1|in|-46|51.5
+Awire|net@737|||2700|pin@296||-53|21|pin@351||-53|39
+Awire|net@745|||900|pin@293||-53|50.5|pin@353||-53|41
+Awire|net@754|||0|predCond@3|in[1]|-21|20|pin@343||-26.5|20
+Awire|net@757|||2700|pin@308||-14|19|pin@305||-14|37
+Awire|net@758|||900|pin@330||-19.5|35|predCond@3|not_state|-19.5|23
+Awire|net@759|||2700|pin@335||-14|39|pin@312||-14|62
+Awire|net@765|||0|pin@312||-14|62|predCond@4|state[1]|-15.5|62
+Awire|net@767|||900|predCond@4|not_state|-19.5|58|pin@360||-19.5|41
+Awire|net@768|||0|pin@360||-19.5|41|fire@0|NotLSN[ZeroOrOne]|-23.5|41
+Awire|net@770|||0|predCond@4|in[1]|-21|61|pin@361||-26.5|61
+Awire|net@779|||1800|pin@312||-14|62|pin@367||-9.5|62
+Awire|net@780|||1800|pin@367||-9.5|62|conn@3|a|-3|62
+Awire|net@781|||900|pms1@0|d|-9.5|66|pin@367||-9.5|62
+Awire|net@783|||1800|pin@308||-14|19|pin@369||-9.5|19
+Awire|net@784|||1800|pin@369||-9.5|19|conn@0|a|-3.5|19
+Awire|net@785|||900|pms1@1|d|-9.5|28|pin@369||-9.5|19
+Awire|net@787|||2700|nms1@0|d|-9.5|16|pin@369||-9.5|19
+Awire|net@789|||2700|nms1@1|d|-9.5|50|pin@367||-9.5|62
+Awire|net@792|||900|sucDri20@1|not_succ|-47.25|46.5|pin@320||-47.25|37
+Awire|net@793|||0|fire@0|MSN[ZeroOrDone]|-39|39|pin@351||-53|39
+Awire|net@795|||2700|fire@0|not_disable@174670546|-33|45.5|pin@373||-33|71
+Awire|net@798|||2700|fire@0|not_disable|-29.5|45.5|pin@374||-29.5|74.5
+Awire|net@799|||0|predCond@3|cond|-20.5|18|pin@375||-39|18
+Awire|net@800|||1800|pin@322||-47.25|35|pin@376||-39|35
+Awire|net@801|||1800|pin@376||-39|35|fire@0|NotMSN[ZeroOrDone]|-39|35
+Awire|net@802|||2700|pin@375||-39|18|pin@376||-39|35
+Awire|net@809|||1800|pin@353||-53|41|fire@0|MSN[ZeroOrOne]|-39|41
+Awire|net@812|||0|predCond@5|state[1]|-51|58|pin@380||-53|58
+Awire|net@813|||2700|predCond@5|not_state|-47|54|pin@381||-47|54
+Awire|net@822|||900|pin@385||-43.5|71.5|pin@386||-43.5|59
+Awire|net@823|||0|pin@386||-43.5|59|predCond@5|cond|-46|59
+Awire|net@825|||0|pin@387||-79.5|50.5|conn@2|y|-81|50.5
+Awire|net@826|||900|pin@387||-79.5|50.5|pin@388||-79.5|39
+Awire|net@827|||900|pin@388||-79.5|39|pin@389||-79.5|26.5
+Awire|net@828|||1800|pin@389||-79.5|26.5|nor2n@0|inb|-78.5|26.5
+Awire|net@829|||0|nor2n@0|ina|-78.5|24.5|pin@390||-79.5|24.5
+Awire|net@831|||0|pin@391||-79.5|21|conn@1|a|-82|21
+Awire|net@832|||900|pin@390||-79.5|24.5|pin@391||-79.5|21
+Awire|net@837|||0|inv@2|in|-68|25.5|nor2n@0|out|-73.5|25.5
+Awire|net@843|||900|sucDri20@1|cond|-46|49.5|pin@396||-46|49
+Awire|net@844|||2700|pin@395||-41.5|49|pin@397||-41.5|49.5
+Awire|net@845|||1800|sucDri20@1|cond|-46|49.5|pin@397||-41.5|49.5
+Awire|net@846|||2700|fire@0|fire|-26.5|48|pin@398||-26.5|57
+Awire|net@847|||2700|pin@398||-26.5|57|pin@361||-26.5|61
+Awire|net@848|||1800|predCond@5|in[1]|-45.5|57|pin@398||-26.5|57
+Awire|net@853|||900|pin@380||-53|58|pin@293||-53|50.5
+Awire|net@854|||1800|conn@7|y|-34.5|71.5|pin@401||-33|71.5
+Awire|net@855|||900|pin@401||-33|71.5|pin@373||-33|71
+Awire|net@856|||1800|conn@6|y|-34.5|74|pin@402||-29.5|74
+Awire|net@857|||900|pin@374||-29.5|74.5|pin@402||-29.5|74
+Awire|net@891|||0|pin@293||-53|50.5|pin@418||-70.5|50.5
+Awire|net@892|||0|pin@418||-70.5|50.5|pin@387||-79.5|50.5
+Awire|net@893|||900|delay@1|in|-70.5|52.5|pin@418||-70.5|50.5
+Awire|net@894|||0|pin@384||-58.5|71.5|pin@419||-70.5|71.5
+Awire|net@895|||1800|pin@419||-70.5|71.5|pin@385||-43.5|71.5
+Awire|net@896|||2700|delay@1|out|-70.5|69.5|pin@419||-70.5|71.5
+Awire|net@897|||1800|pin@320||-47.25|37|fire@0|NotMSN[ZeroOrOne]|-39|37
+Awire|net@905|||900|pin@385||-43.5|71.5|pin@423||-43.5|68.5
+Awire|net@921|||2700|pin@433||-59.5|25.5|delay@3|in|-59.5|28.5
+Awire|net@922|||2700|delay@3|out|-59.5|45.5|pin@434||-59.5|46.5
+Awire|net@923|||1800|pin@434||-59.5|46.5|pin@435||-41.5|46.5
+Awire|net@924|||2700|pin@435||-41.5|46.5|pin@395||-41.5|49
+Awire|net@931|||1800|inv@2|out|-63|25.5|pin@439||-61.5|25.5
+Awire|net@932|||900|pin@439||-61.5|25.5|pin@440||-61.5|14.5
+Awire|net@933|||0|pin@440||-61.5|14.5|pin@441||-66|14.5
+Awire|net@934|||900|pin@441||-66|14.5|pin@442||-66|8
+Awire|net@935|||1800|pin@442||-66|8|pin@443||-63.5|8
+Awire|net@936|||900|inv@9|in|-63.5|8.5|pin@443||-63.5|8
+Awire|net@937|||0|inv@10|in|-56.5|8.5|inv@9|out|-58.5|8.5
+Awire|net@938|||1800|inv@10|out|-51.5|8.5|pin@444||-49|8.5
+Awire|net@939|||2700|pin@444||-49|8.5|pin@445||-49|12.5
+Awire|net@940|||0|pin@445||-49|12.5|pin@446||-59|12.5
+Awire|net@941|||0|pin@446||-59|12.5|pin@447||-59.5|12.5
+Awire|net@942|||900|pin@433||-59.5|25.5|pin@447||-59.5|12.5
+Awire|net@944|||0|pin@296||-53|21|pin@448||-70.5|21
+Awire|net@945|||0|pin@448||-70.5|21|pin@391||-79.5|21
+Awire|net@946|||2700|delay@0|in|-70.5|18.5|pin@448||-70.5|21
+Awire|net@947|||900|delay@0|out|-70.5|1.5|pin@449||-70.5|-21.5
+Awire|net@948|||1800|pin@449||-70.5|-21.5|pin@450||-24.5|-21.5
+Awire|net@949|||2700|pin@450||-24.5|-21.5|pin@451||-24.5|63.5
+Awire|net@950|||1800|pin@451||-24.5|63.5|pin@452||-20.5|63.5
+Awire|net@951|||2700|predCond@4|cond|-20.5|63|pin@452||-20.5|63.5
+Awire|net@954|||900|delay@5|in|-70.5|74.5|pin@419||-70.5|71.5
+Awire|net@955|||2700|delay@5|out|-70.5|91.5|pin@455||-70.5|96
+Awire|net@956|||1800|pin@455||-70.5|96|pin@456||-41|96
+Awire|net@957|||900|pin@456||-41|96|pin@457||-41|22
+Awire|net@958|||0|pin@457||-41|22|sucDri20@0|cond|-46|22
+Awire|not_load_zero|D5G2;X-3.5;||0|pms1@0|g|-12.5|68|pin@368||-20|68
+Awire|not_load_zero|D5G2;X7;||1800|pms1@1|g|-6.5|30|pin@370||2|30
 Esucc[OneOrTwo]|LSN[ZeroOrDone]|D5G2;X12.5;|conn@0|a|B
-Esucc[TwoOrEmpty]|LSN[ZeroOrOne]|D5G2;X13.5;|conn@3|a|B
+Esucc[TwoOrEmpty]|LSN[ZeroOrTwo]|D5G2;X13.5;|conn@3|a|B
 Epred[OneOrTwo]|MSN[ZeroOrDone]|D5G2;X13;|conn@1|a|B
-Epred[TwoOrEmpty]|MSN[ZeroOrOne]|D5G2;X-10.5;|conn@2|a|B
-Eload_one||D6G2;X-9.5;|conn@10|a|I
-Eload_or_master_clear|not_load_or_master_clear|D6G2;X-25;|conn@6|a|I
-Enot_load_zero||D6G2;X-14;|conn@11|a|I
+Epred[TwoOrEmpty]|MSN[ZeroOrTwo]|D5G2;X-10.5;|conn@2|a|B
+Edisable||D5G2;X-5;|conn@7|a|I
+Enot_load_one|load_one|D5G2;X-5.5;|conn@5|a|I
+Enot_disable||D5G2;X-7;|conn@6|a|I
+Eload_one|not_load_zero|D5G2;X-8;|conn@4|a|I
 X
 
 # Cell predCondMSC;1{ic}
-CpredCondMSC;1{ic}||artwork|1227921780535|1247536652490|E
+CpredCondMSC;1{ic}||artwork|1227921780535|1247595835099|E
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NThick-Circle|art@2||2|0|1|1||
 NThick-Circle|art@6||-0.5|0|4|4|RRR||ART_degrees()F[0.0,3.1415927]
 NThick-Circle|art@7||-0.5|3|1|1||
 Nschematic:Bus_Pin|pin@2||-3|1|-1|-1||
-Nschematic:Bus_Pin|pin@4||-1|-3|-1|-1||
 Nschematic:Bus_Pin|pin@6||2.5|0|-1|-1||
 NPin|pin@8||1|3|1|1|RR|
 NPin|pin@9||1.5|0|1|1||
@@ -480,20 +692,17 @@ NPin|pin@24||1|2.125|1|1|RR|
 NPin|pin@25||-2.5|2|1|1||
 NPin|pin@26||-0.5|2|1|1||
 NPin|pin@27||-2.5|-2|1|1||
-NPin|pin@28||-1|-2|1|1||
 NPin|pin@29||-2.5|1|1|1||
 NPin|pin@30||-3|1|1|1||
 NPin|pin@34||-0.5|-2|1|1||
-NPin|pin@35||-1|-3|1|1||
-Nschematic:Bus_Pin|pin@37||0.5|-3||||
-NPin|pin@39||0.5|-3|1|1||
-NPin|pin@40||0.5|-1.5|1|1||
 Nschematic:Bus_Pin|pin@41||-2.5|-1||||
-Ngeneric:Invisible-Pin|pin@43||-0.5|0|||||ART_message(D5G2;)S11T
+Ngeneric:Invisible-Pin|pin@43||-0.5|0|||||ART_message(D5G2;)S6T
 NPin|pin@44||-1|3|1|1||
 NPin|pin@45||-1.5|4|1|1||
 NPin|pin@46||-1.5|3|1|1||
 Nschematic:Wire_Pin|pin@47||-1.5|4||||
+NPin|pin@48||-1.5|-2|1|1||
+NPin|pin@49||-2.5|-1|1|1||
 AThicker|net@4|||FS1388|pin@18||0|3|pin@17||1|2.125
 AThicker|net@5|||FS900|pin@14||1.5|3|pin@9||1.5|0
 AThicker|net@8|||FS900|pin@19||1|3.75|pin@8||1|3
@@ -502,17 +711,13 @@ AThicker|net@11|||FS369|pin@19||1|3.75|pin@18||0|3
 AThicker|net@12|||FS900|pin@8||1|3|pin@24||1|2.125
 AThicker|net@14|||FS900|pin@15||-2|3|pin@16||-2|2
 AThicker|net@16|||FS1800|pin@25||-2.5|2|pin@26||-0.5|2
-AThicker|net@18|||FS1800|pin@27||-2.5|-2|pin@28||-1|-2
 AThicker|net@19|||FS900|pin@25||-2.5|2|pin@29||-2.5|1
 AThicker|net@20|||FS0|pin@29||-2.5|1|pin@30||-3|1
-AThicker|net@24|||FS1800|pin@28||-1|-2|pin@34||-0.5|-2
-AThicker|net@25|||FS900|pin@28||-1|-2|pin@35||-1|-3
 AThicker|net@26|||FS900|pin@29||-2.5|1|pin@27||-2.5|-2
-ASolid|net@28|||FS2700|pin@39||0.5|-3|pin@40||0.5|-1.5
 AThicker|net@29|||FS1800|pin@15||-2|3|pin@44||-1|3
 AThicker|net@30|||FS900|pin@45||-1.5|4|pin@46||-1.5|3
-Emc|MC|D5G2;X-1.5;Y-2;|pin@4||I
-ENotMS||D5G2;X4;Y-1.5;|pin@37||I
+AThicker|net@31|||FS1800|pin@27||-2.5|-2|pin@34||-0.5|-2
+AThicker|net@32|||FS3150|pin@48||-1.5|-2|pin@49||-2.5|-1
 Econd||D5G2;X-3;|pin@41||I
 Ein[1]|fire|D5G2;X-1.5;|pin@2||I
 Enot_state||D5G2;Y1;|pin@47||O
@@ -520,20 +725,16 @@ Estate[1]|state|D5G2;X2.5;|pin@6||B
 X
 
 # Cell predCondMSC;1{sch}
-CpredCondMSC;1{sch}||schematic|1227920907034|1247535229176|
-IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@0||34|-3.5|||D0G4;|ATTR_Delay(D5G1;NPX5;Y-1.5;)I100|ATTR_X(D5G1.5;NPX3.5;Y0.5;)S10
-IredFive:PMOS;1{ic}|PMOS@0||-7.5|7.5|||D5G4;|ATTR_Delay(D5G1;NPX-2.5;Y-1.5;)I100|ATTR_X(D5G1.5;NPX-2.5;Y1.5;)I1
-IredFive:PMOS;1{ic}|PMOS@1||-5.5|7.5|X||D5G4;|ATTR_Delay(D5G1;NPX-4.5;Y1.5;)I100|ATTR_X(D5G1.5;NPX-3.5;Y-1.5;)I1
+CpredCondMSC;1{sch}||schematic|1227920907034|1247717673627|
+IredFive:PMOS;1{ic}|PMOS@0||-7.5|7.5|||D5G4;|ATTR_Delay(D5G1;NPX-2.5;Y-1.5;)I100|ATTR_X(D5G1.5;NPX-2.5;Y1.5;)S2
+IredFive:PMOS;1{ic}|PMOS@1||-5.5|7.5|X||D5G4;|ATTR_Delay(D5G1;NPX-4.5;Y1.5;)I100|ATTR_X(D5G1.5;NPX-3.5;Y-1.5;)S2
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-23|0.5||||
-NOff-Page|conn@1||-23|24.5|||XRR|
 NOff-Page|conn@2||42.75|0.5|||X|
-NOff-Page|conn@3||-23|22|||XRR|
 NOff-Page|conn@4||9.5|-10|||X|
 NOff-Page|conn@5||12.5|20||||
-NGround|gnd@0||34|-9.5|||X|
-IredFive:invLT;1{ic}|invLT@0||17|12|YRR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:nms3c;1{ic}|nms3c@0||-6.5|-14|||D5G4;|ATTR_Delay(D5G1;NPX3;Y-5.5;)I100|ATTR_X(D5G1.5;NOLPX-3.5;Y0.5;)S1
+IredFive:invLT;1{ic}|invLT@0||17|12|YRR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX-5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nms2b;1{ic}|nms2b@0||-6.5|-10|X||D5G4;|ATTR_Delay(D5G1;NPX3;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NPX-3.75;Y-4;)S8
 Ngeneric:Invisible-Pin|pin@0||-0.5|39|||||ART_message(D5G5;)SpredCondMSC
 Ngeneric:Invisible-Pin|pin@1||0|35|||||ART_message(D5G3;)Sam 13 Jul 2009
 NWire_Pin|pin@29||-18|-6|||X|
@@ -547,53 +748,41 @@ NWire_Pin|pin@59||-18|7.5||||
 NWire_Pin|pin@60||-6.5|5.5||||
 NWire_Pin|pin@61||-1|-10||||
 NWire_Pin|pin@64||-1|7.5||||
-NWire_Pin|pin@65||5|16||||
-NWire_Pin|pin@66||4|-14||||
-NWire_Pin|pin@67||24|-3.5||||
-NWire_Pin|pin@68||24.5|5||||
-NWire_Pin|pin@69||-15|22||||
-NWire_Pin|pin@70||-15|24.5||||
 NWire_Pin|pin@71||8.5|20||||
 NWire_Pin|pin@72||8.5|12||||
-IredFive:pms1;2{ic}|pms1@0||34|5|||D5G4;|ATTR_Delay(D5G1;NPX4;Y-1;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y1;)S1
-IredFive:pms2a;2{ic}|pms2a@0||-6.5|16|X||D5G4;|ATTR_Delay(D5G1;NPX-3;Y0.25;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX2.25;Y2.75;)S1
+NWire_Pin|pin@74||-6.5|10||||
+NWire_Pin|pin@76||-6.5|-4||||
+NWire_Pin|pin@77||-11|-6||||
+IredFive:pms1;2{ic}|pms1@1||-6.5|12|X||D5G4;|ATTR_Delay(D5G1;NPX-2;Y-1.5;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y1;)S1
 IpredCondMSC;1{ic}|pred10wM@1||28.5|25|||D5G4;
-Awire|MC|D5G2;||1800|pms2a@0|g|-3.5|16|pin@65||5|16
-Awire|MC|D5G2;||0|NMOSx@0|g|31|-3.5|pin@67||24|-3.5
-Awire|NotMS|D5G2;||0|pms1@0|g|31|5|pin@68||24.5|5
-Awire|NotMS|D5G2;||1800|nms3c@0|g|-3.5|-14|pin@66||4|-14
-Awire|net@6|||2700|gnd@0||34|-7.5|NMOSx@0|s|34|-5.5
 Awire|net@90|||0|pin@41||34|0.5|pin@36||-6.5|0.5
 Awire|net@91|||1800|invLT@0|in|19.5|12|pin@37||21.5|12
 Awire|net@92|||0|conn@2|y|40.75|0.5|pin@38||21.5|0.5
 Awire|net@93|||900|pin@37||21.5|12|pin@38||21.5|0.5
 Awire|net@100|||1800|pin@38||21.5|0.5|pin@41||34|0.5
-Awire|net@101|||2700|NMOSx@0|d|34|-1.5|pin@41||34|0.5
 Awire|net@103|||2700|pin@29||-18|-6|pin@42||-18|0.5
 Awire|net@105|||1800|conn@0|y|-21|0.5|pin@42||-18|0.5
-Awire|net@112|||900|pms1@0|d|34|3|pin@41||34|0.5
-Awire|net@120|||2700|nms3c@0|d|-6.5|-4|pin@36||-6.5|0.5
-Awire|net@121|||1800|pin@29||-18|-6|nms3c@0|g3|-9.5|-6
 Awire|net@146|||1800|PMOS@0|s|-7.5|9.5|pin@58||-6.5|9.5
 Awire|net@147|||1800|pin@58||-6.5|9.5|PMOS@1|s|-5.5|9.5
-Awire|net@148|||900|pms2a@0|d|-6.5|10|pin@58||-6.5|9.5
 Awire|net@150|||2700|pin@42||-18|0.5|pin@59||-18|7.5
 Awire|net@151|||0|PMOS@0|g|-10.5|7.5|pin@59||-18|7.5
 Awire|net@153|||1800|PMOS@0|d|-7.5|5.5|pin@60||-6.5|5.5
 Awire|net@154|||1800|pin@60||-6.5|5.5|PMOS@1|d|-5.5|5.5
 Awire|net@155|||2700|pin@36||-6.5|0.5|pin@60||-6.5|5.5
 Awire|net@156|||0|conn@4|y|7.5|-10|pin@61||-1|-10
-Awire|net@157|||0|pin@61||-1|-10|nms3c@0|g2|-3.5|-10
 Awire|net@161|||0|pin@64||-1|7.5|PMOS@1|g|-2.5|7.5
 Awire|net@171|||900|pin@64||-1|7.5|pin@61||-1|-10
-Awire|net@172|||1800|conn@3|y|-21|22|pin@69||-15|22
-Awire|net@173|||1800|conn@1|y|-21|24.5|pin@70||-15|24.5
 Awire|net@174|||0|conn@5|a|10.5|20|pin@71||8.5|20
-Awire|net@175|||1800|pms2a@0|g2|-3.5|12|pin@72||8.5|12
 Awire|net@176|||1800|pin@72||8.5|12|invLT@0|out|14.5|12
 Awire|net@177|||900|pin@71||8.5|20|pin@72||8.5|12
-Emc|MC|D4G2;|conn@1|a|I
-ENotMS||D5G2;X-7.5;|conn@3|y|I
+Awire|net@179|||2700|pin@58||-6.5|9.5|pin@74||-6.5|10
+Awire|net@181|||900|pms1@1|d|-6.5|10|pin@74||-6.5|10
+Awire|net@182|||0|pin@72||8.5|12|pms1@1|g|-3.5|12
+Awire|net@183|||900|pin@36||-6.5|0.5|pin@76||-6.5|-4
+Awire|net@184|||1800|pin@29||-18|-6|pin@77||-11|-6
+Awire|net@186|||2700|nms2b@0|d|-6.5|-4|pin@76||-6.5|-4
+Awire|net@187|||0|nms2b@0|g2|-9.5|-6|pin@77||-11|-6
+Awire|net@188|||0|pin@61||-1|-10|nms2b@0|g|-3.5|-10
 Econd||D6G2;X-5;|conn@4|a|I
 Ein[1]|fire|D4G2;|conn@0|a|I
 Enot_state||D5G2;X8.5;|conn@5|a|O
@@ -760,20 +949,19 @@ Esucc|state|D5G2;X4.5;|pin@2||B
 X
 
 # Cell succCond;1{sch}
-CsuccCond;1{sch}||schematic|1188777360591|1247535209250|
-IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@0||-3|-4|||D0G4;|ATTR_Delay(D5G1;NPX-2;Y-2.5;)I100|ATTR_X(D5G1.5;NPX-0.5;Y3;)S5
-IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@1||3|-4|X||D0G4;|ATTR_Delay(D5G1;NPX-2;Y-2;)I100|ATTR_X(D5G1.5;NPX-0.5;Y2.5;)S5
-IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@2||0|-12|X||D0G4;|ATTR_Delay(D5G1;NPX3.5;Y-2;)I100|ATTR_X(D5G1.5;NPX3.5;Y0.5;)S10
+CsuccCond;1{sch}||schematic|1188777360591|1247713530263|
+IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@0||-3|-4|||D0G4;|ATTR_Delay(D5G1;NPX-2;Y-2.5;)I100|ATTR_X(D5G1.5;NPX-0.5;Y3;)S1
+IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@1||3|-4|X||D0G4;|ATTR_Delay(D5G1;NPX-2;Y-2;)I100|ATTR_X(D5G1.5;NPX-0.5;Y2.5;)S1
+IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@2||0|-12|X||D0G4;|ATTR_Delay(D5G1;NPX3.5;Y-2;)I100|ATTR_X(D5G1.5;NPX3.5;Y0.5;)S1
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-17|0||||
 NOff-Page|conn@1||23.5|0||||
 NOff-Page|conn@2||18|6|||X|
 NOff-Page|conn@3||23|-16.5||||
 NGround|gnd@0||0|-18.5||||
-IredFive:inv;1{ic}|inv@1||16|-12|X||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@1||16|-12|X||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y4.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 Ngeneric:Invisible-Pin|pin@0||9|32.5|||||ART_message(D5G6;)SsuccCond
-Ngeneric:Invisible-Pin|pin@1||8|20.5|||||ART_message(D5G3;)Sam 13 Jul 2009
-Ngeneric:Invisible-Pin|pin@2||7.5|25|||||ART_message(D5G4;)Ssuccessor driver w/o amp
+Ngeneric:Invisible-Pin|pin@1||9.5|27|||||ART_message(D5G3;)Sam 13 Jul 2009
 NWire_Pin|pin@4||-3|0||||
 NWire_Pin|pin@32||19.5|-12||||
 NWire_Pin|pin@33||19.5|0||||
@@ -790,7 +978,7 @@ NWire_Pin|pin@62||9|10||||
 NWire_Pin|pin@63||-9|6||||
 NWire_Pin|pin@64||4|-16.5||||
 NWire_Pin|pin@65||4|-12||||
-IredFive:pms2;1{ic}|pms2@0||0|10|X||D0G4;|ATTR_Delay(D5G1;NPX-3;Y-1.5;)I100|ATTR_X(D5G1.5;NOLPX2.25;Y1;)S20
+IredFive:pms2;1{ic}|pms2@0||0|10|X||D0G4;|ATTR_Delay(D5G1;NPX-3;Y-1.5;)I100|ATTR_X(D5G1.5;NOLPX1.25;Y6;)S8
 IsuccCond;1{ic}|sucDri20@2||36|16|||D5G4;
 IorangeTSMC090nm:wire90;1{ic}|wire90@0||8.5|-12|||D0G4;|ATTR_L(D5G1;PUD)D124.7|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3
 Awire|net@94|||0|inv@1|out|13.5|-12|wire90@0|b|11|-12