works, but just barely -- really cutting it close!
authorAdam Megacz <adam.megacz@sun.com>
Fri, 17 Jul 2009 06:12:13 +0000 (06:12 +0000)
committerAdam Megacz <adam.megacz@sun.com>
Fri, 17 Jul 2009 06:12:13 +0000 (06:12 +0000)
electric/omegaCounter.jelib

index ba75e81..3bf08c7 100644 (file)
@@ -163,7 +163,212 @@ Enot_fire[2]||D5G2;X-5.5;Y1.5;|pin@33||O
 X
 
 # Cell fire;1{sch}
-Cfire;1{sch}||schematic|1247526811643|1247799741482|
+Cfire;1{sch}||schematic|1247526811643|1247810782419|
+IredFive:NMOS;1{ic}|NMOS@0||8|-51|RR||D5G4;|ATTR_X(D5G1.5;NPX-3.5;Y2;)S8
+IredFive:NMOS;1{ic}|NMOS@1||-1|-44.5|RR||D5G4;|ATTR_X(D5G1.5;NPX-3.5;Y2;)S8
+IredFive:NMOS;1{ic}|NMOS@2||-14|-41.5|||D5G4;|ATTR_X(D5G1.5;NPX5;Y0.5;)S16
+IredFive:NMOS;1{ic}|NMOS@5||-26|-26.5|||D5G4;|ATTR_X(D5G1.5;NPX5;Y0.5;)S8
+IredFive:NMOS;1{ic}|NMOS@7||-14|-47.5|||D5G4;|ATTR_X(D5G1.5;NPX5;Y0.5;)S16
+IredFive:PMOS;1{ic}|PMOS@0||-6.5|-14|RR||D5G4;|ATTR_X(D5G1.5;NPX-3;Y2;)S16
+IredFive:PMOS;1{ic}|PMOS@1||-9.5|-14|XRR||D5G4;|ATTR_X(D5G1.5;NPX-3;Y2;)S16
+IredFive:PMOS;1{ic}|PMOS@2||-8|-9.5|RR||D5G4;|ATTR_X(D5G1.5;NPX5.5;Y-2;)S16
+IredFive:PMOS;1{ic}|PMOS@3||-8|-4|RR||D5G4;|ATTR_X(D5G1.5;NPX5;)S16
+IredFive:PMOS;1{ic}|PMOS@4||-8|2|XRR||D5G4;|ATTR_X(D5G1.5;NPX4.5;Y-1;)S500
+Ngeneric:Facet-Center|art@0||0|0||||AV
+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_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[ZeroOrTwo]|D6G2;X-19.5;|conn@0|y|I
+EMSN[ZeroOrDone]||D4G2;|conn@2|a|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[ZeroOrTwo]|D4G2;|conn@5|a|I
+ENotMSN[ZeroOrDone]||D6G2;X-20.5;|conn@7|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
+
+# Cell fire2stage;1{ic}
+Cfire2stage;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|
+NThick-Circle|art@4||-7.5|10|1|1|RRR|
+Nschematic:Bus_Pin|pin@0||4.5|1|||X|
+Nschematic:Wire_Pin|pin@1||2.5|1|||X|
+Nschematic:Bus_Pin|pin@2||4.5|3|||X|
+Nschematic:Wire_Pin|pin@3||2.5|3|||X|
+Nschematic:Bus_Pin|pin@4||-11|3||||
+Nschematic:Wire_Pin|pin@5||-9|3||||
+Nschematic:Bus_Pin|pin@6||-11|5||||
+Nschematic:Wire_Pin|pin@7||-9|5||||
+Nschematic:Bus_Pin|pin@8||4.5|-1|||X|
+Nschematic:Wire_Pin|pin@9||2.5|-1|||X|
+Nschematic:Bus_Pin|pin@10||4.5|5|||X|
+Nschematic:Wire_Pin|pin@11||2.5|5|||X|
+Nschematic:Bus_Pin|pin@12||-11|-1||||
+Nschematic:Wire_Pin|pin@13||-9|-1||||
+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;)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
+Ngeneric:Invisible-Pin|pin@23||-8|-1|||||ART_message(D5G1;)S+3
+Ngeneric:Invisible-Pin|pin@24||-8|1|||||ART_message(D5G1;)S+3
+Ngeneric:Invisible-Pin|pin@25||-8|5|||||ART_message(D5G1;)S+3
+Ngeneric:Invisible-Pin|pin@26||-8|3|||||ART_message(D5G1;)S+3
+Ngeneric:Invisible-Pin|pin@27||1.5|5|||||ART_message(D5G1;)S+3
+Ngeneric:Invisible-Pin|pin@28||1.5|3|||||ART_message(D5G1;)S+3
+Ngeneric:Invisible-Pin|pin@29||1.5|1|||||ART_message(D5G1;)S+3
+Ngeneric:Invisible-Pin|pin@30||1.5|-1|||||ART_message(D5G1;)S+3
+Nschematic:Bus_Pin|pin@31||1.5|-5.5||||
+Nschematic:Wire_Pin|pin@32||2.5|-5.5||||
+Nschematic:Bus_Pin|pin@33||-7.5|12||||
+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
+Aschematic:wire|net@3|||0|pin@7||-9|5|pin@6||-11|5
+Aschematic:wire|net@4|||1800|pin@9||2.5|-1|pin@8||4.5|-1
+Aschematic:wire|net@5|||1800|pin@11||2.5|5|pin@10||4.5|5
+Aschematic:wire|net@6|||0|pin@13||-9|-1|pin@12||-11|-1
+Aschematic:wire|net@7|||0|pin@15||-9|1|pin@14||-11|1
+Aschematic:wire|net@8|||2700|pin@17||1.5|9.5|pin@16||1.5|12
+Aschematic:wire|net@9|||900|pin@20||-7.5|-6.5|pin@19||-7.5|-8
+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[ZeroOrTwo]||D5G2;X-9.5;|pin@2||I
+EMSN[ZeroOrDone]||D4G2;|pin@4||I
+EMSN[ZeroOrTwo]||D4G2;|pin@6||I
+ENotLSN[ZeroOrDone]||D5G2;X-11;|pin@8||I
+ENotLSN[ZeroOrTwo]||D5G2;X-9.5;|pin@10||I
+ENotMSN[ZeroOrDone]||D4G2;|pin@12||I
+ENotMSN[ZeroOrTwo]||D4G2;|pin@14||I
+Edisable||D5G2;RX-1;Y5;|pin@40||I
+Efire[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[1]||D5G2;X1;Y-4.5;|pin@19||O
+Enot_fire[2]||D5G2;X-5.5;Y1.5;|pin@33||O
+X
+
+# Cell fire2stage;1{sch}
+Cfire2stage;1{sch}||schematic|1247526811643|1247806415765|
 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;)S8
@@ -189,7 +394,7 @@ 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;
+Ifire2stage;1{ic}|fire2sta@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
@@ -274,19 +479,19 @@ 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[ZeroOrTwo]|D6G2;X-19.5;|conn@0|y|I
+ELSN[ZeroOrDone]||D6G2;X-16.5;|conn@1|a|I
+ELSN[ZeroOrTwo]||D6G2;X-19.5;|conn@0|y|I
 EMSN[ZeroOrDone]||D4G2;|conn@2|a|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[ZeroOrTwo]|D4G2;|conn@5|a|I
+EMSN[ZeroOrTwo]||D6G2;X-20;|conn@3|y|I
+ENotLSN[ZeroOrDone]||D4G2;|conn@4|a|I
+ENotLSN[ZeroOrTwo]||D4G2;|conn@5|a|I
 ENotMSN[ZeroOrDone]||D6G2;X-20.5;|conn@7|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
+ENotMSN[ZeroOrTwo]||D5G2;X-10;|conn@6|a|I
+Edisable||D5G2;X-4;|conn@14|a|I
+Efire[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[1]||D5G2;X9;|conn@9|a|O
 Enot_fire[2]||D5G2;X5;|conn@11|y|O
 X
 
@@ -454,15 +659,15 @@ Enot_load_zero||D5G2;X-5.5;Y-0.5;|pin@31||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1247806183418|
-IorangeTSMC090nm:LEload;1{ic}|LEload@0||-84.5|44|XY||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
-IorangeTSMC090nm:LEload;1{ic}|LEload@1||-84|26.5|X||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
+ConeBit;1{sch}||schematic|1242942044308|1247810231976|
+IorangeTSMC090nm:LEload;1{ic}|LEload@0||-96.5|44|XY||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
+IorangeTSMC090nm:LEload;1{ic}|LEload@1||-96|26.5|X||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
 IorangeTSMC090nm:LEload;1{ic}|LEload@2||-2.5|11|||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
 IorangeTSMC090nm:LEload;1{ic}|LEload@4||-0.5|67.5|||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-1.5|18.5||||
-NOff-Page|conn@1||-84|21|||RR|
-NOff-Page|conn@2||-83|50.5||||
+NOff-Page|conn@1||-96|21|||RR|
+NOff-Page|conn@2||-95|50.5||||
 NOff-Page|conn@3||-1|61||||
 NOff-Page|conn@4||-95.5|76.5||||
 NOff-Page|conn@5||-95.5|73.5||||
@@ -471,31 +676,35 @@ NOff-Page|conn@7||-36.5|80.5||||
 Idelay;1{ic}|delay@1||-71|46|YR||D5G4;
 Ifire;1{ic}|fire@0||-28|36|||D5G4;
 IredFive:inv;1{ic}|inv@9||-60|35|R||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX4;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@14||-48|57.5|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y4.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@15||-18|43.5|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y4.5;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@16||-18.5|28|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y4.5;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@14||-54|53.5|XRR||D0G4;|ATTR_X(D5G1.5;NPX2.5;Y-2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@15||-18|41|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@16||-18.5|35|X||D0G4;|ATTR_X(D5G1.5;NPX0.5;Y-3;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@19||-48.5|35|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@20||-81.5|32.5|XRRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@21||-81.5|39|XRRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@22||-76|28.5|XR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@23||-76|35|XR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@0||-18|70.5|YRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX2.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:nand2;1{ic}|nand2@1||-54.5|67|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1.5;Y3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:nms1;2{ic}|nms1@0||-9.5|5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX-5;Y-3.25;)S8
+IredFive:nand2;1{ic}|nand2@1||-54.5|76|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1.5;Y3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nms1;2{ic}|nms1@0||-9.5|11|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX-5;Y-3.25;)S8
 IredFive:nms1;2{ic}|nms1@1||-9.5|48|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX-1.5;Y2.75;)S8
 IredFive:nor2n;1{ic}|nor2n@0||-60|27.5|R||D5G4;|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@194||-114|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@227||-98.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||-99.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||-67|50.5||||
 NWire_Pin|pin@296||-53|21||||
-NWire_Pin|pin@305||-14|37||||
-NWire_Pin|pin@308||-14|18.5||||
+NWire_Pin|pin@305||-11.5|37||||
+NWire_Pin|pin@308||-11.5|18.5||||
 NWire_Pin|pin@312||-14|61||||
 NWire_Pin|pin@335||-14|39||||
 NWire_Pin|pin@337||-35.5|22||||
@@ -508,82 +717,83 @@ NWire_Pin|pin@367||-9.5|61||||
 NWire_Pin|pin@368||-20|80||||
 NWire_Pin|pin@369||-9.5|18.5||||
 NWire_Pin|pin@370||2|30||||
-NWire_Pin|pin@371||-22.5|5||||
+NWire_Pin|pin@371||-22.5|11||||
 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|17.5||||
 NWire_Pin|pin@376||-39|35||||
-NWire_Pin|pin@380||-67|63.5||||
+NWire_Pin|pin@380||-67|72.5||||
 NWire_Pin|pin@395||-44|49||||
 NWire_Pin|pin@397||-44|49.5||||
-NWire_Pin|pin@398||-26.5|64.5||||
+NWire_Pin|pin@398||-26.5|73.5||||
 NWire_Pin|pin@401||-33|80.5||||
 NWire_Pin|pin@402||-29.5|83||||
 NWire_Pin|pin@418||-71|50.5||||
 NWire_Pin|pin@435||-44|44.5||||
-NWire_Pin|pin@451||-24.5|60||||
 NWire_Pin|pin@457||-41|20||||
 NWire_Pin|pin@463||-60|44.5||||
 NWire_Pin|pin@466||-65|29||||
 NWire_Pin|pin@471||-44.5|17.5||||
-NWire_Pin|pin@473||-59|57.5||||
+NWire_Pin|pin@473||-59|53.5||||
 NWire_Pin|pin@474||-59|50.5||||
-NWire_Pin|pin@477||-43|57.5||||
+NWire_Pin|pin@477||-43|53.5||||
 NWire_Pin|pin@478||-43|37||||
-NWire_Pin|pin@479||-14|43.5||||
-NWire_Pin|pin@480||-22.5|43.5||||
+NWire_Pin|pin@479||-14|41||||
+NWire_Pin|pin@480||-22.5|41||||
 NWire_Pin|pin@481||-22.5|41||||
 NWire_Pin|pin@482||-22.5|64.5||||
-NWire_Pin|pin@483||-22|28||||
+NWire_Pin|pin@483||-22|35||||
 NWire_Pin|pin@484||-22|35||||
 NWire_Pin|pin@485||-22|22||||
-NWire_Pin|pin@486||-14|28||||
+NWire_Pin|pin@486||-11.5|35||||
 NWire_Pin|pin@491||-14|69.5||||
-NWire_Pin|pin@492||-13|71.5||||
-NWire_Pin|pin@493||-13|18.5||||
-NWire_Pin|pin@495||-51|68||||
+NWire_Pin|pin@492||-11.5|71.5||||
+NWire_Pin|pin@495||-51|77||||
 NWire_Pin|pin@496||-51|50.5||||
 NWire_Pin|pin@497||-39|35||||
-NWire_Pin|pin@498||-39|66||||
+NWire_Pin|pin@498||-39|75||||
 NWire_Pin|pin@499||-22.5|70.5||||
 NWire_Pin|pin@501||-60|39||||
 NWire_Pin|pin@505||-43|47||||
-NWire_Pin|pin@506||-67|72||||
-NWire_Pin|pin@507||-51|72||||
-NWire_Pin|pin@508||-54.5|62.5||||
-NWire_Pin|pin@509||-54.5|59||||
-NWire_Pin|pin@510||-65|59||||
-NWire_Pin|pin@511||-79|44||||
-NWire_Pin|pin@512||-79|50.5||||
-NWire_Pin|pin@513||-79|26.5||||
-NWire_Pin|pin@514||-79|21||||
+NWire_Pin|pin@506||-67|81||||
+NWire_Pin|pin@507||-51|81||||
+NWire_Pin|pin@508||-54.5|71.5||||
+NWire_Pin|pin@509||-54.5|56.5||||
+NWire_Pin|pin@510||-65|56.5||||
+NWire_Pin|pin@511||-91|44||||
+NWire_Pin|pin@512||-91|50.5||||
+NWire_Pin|pin@513||-91|26.5||||
+NWire_Pin|pin@514||-91|21||||
 NWire_Pin|pin@515||-7.5|11||||
 NWire_Pin|pin@516||-7.5|18.5||||
 NWire_Pin|pin@517||-7|67.5||||
 NWire_Pin|pin@518||-7|61||||
 NWire_Pin|pin@521||-53|35||||
-NWire_Pin|pin@526||-56|21||||
-NWire_Pin|pin@527||-56|9||||
-NWire_Pin|pin@528||-24.5|9||||
 NWire_Pin|pin@531||-59|21||||
 NWire_Pin|pin@534||-65|14||||
 NWire_Pin|pin@537||-41|14||||
 NWire_Pin|pin@540||-71|23||||
 NWire_Pin|pin@541||-65|23||||
 NWire_Pin|pin@542||-61|23||||
+NWire_Pin|pin@545||-81.5|50.5||||
+NWire_Pin|pin@546||-81.5|26||||
+NWire_Pin|pin@548||-65|26||||
+NWire_Pin|pin@549||-11.5|37||||
+NWire_Pin|pin@552||-81.5|23||||
+NWire_Pin|pin@554||-76|60||||
+NWire_Pin|pin@555||-76|21||||
 IredFive:pms1;2{ic}|pms1@0||-9.5|80|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y1;)S8
 IredFive:pms1;2{ic}|pms1@1||-9.5|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-2.75;Y3;)S8
-IpredCondMSC;1{ic}|predCond@3||-18|18.5|||D5G4;
-IpredCondMSC;1{ic}|predCond@4||-18|61|||D5G4;
-IpredCondMSC;1{ic}|predCond@5||-60.5|63.5|YRR||D5G4;
+IpredCondMSC;1{ic}|predCond@3||-18|18.5|||D5G4;|ATTR_X(D5G2;NPX0.25;Y-5.25;)S8
+IpredCondMSC;1{ic}|predCond@4||-18|61|||D5G4;|ATTR_X(D5G2;NPX-0.75;Y-5.25;)S8
+IpredCondMSC;1{ic}|predCond@5||-60.5|72.5|YRR||D5G4;|ATTR_X(D5G2;NPX2.75;Y-5.75;)S8
 IsuccCond;1{ic}|sucDri20@0||-48|21|YRR||D5G4;
 IsuccCond;1{ic}|sucDri20@1||-48|50.5|YRR||D5G4;
-Awire|load_one|D5G2;||0|nms1@0|g|-12.5|5|pin@371||-22.5|5
+Awire|load_one|D5G2;||0|nms1@0|g|-12.5|11|pin@371||-22.5|11
 Awire|load_one|D5G2;X4;||1800|nms1@1|g|-6.5|48|pin@372||7.5|48
 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|18.5|pin@308||-14|18.5
+Awire|net@652|||1800|predCond@3|state[1]|-15.5|18.5|pin@308||-11.5|18.5
 Awire|net@699|||1800|fire@0|LSN[ZeroOrOne]|-23.5|39|pin@335||-14|39
 Awire|net@703|||2700|pin@337||-35.5|22|fire@0|not_fire|-35.5|28
 Awire|net@715|||1800|sucDri20@0|in|-46|22|pin@337||-35.5|22
@@ -596,7 +806,7 @@ Awire|net@770|||0|predCond@4|in[1]|-21|62|pin@361||-26.5|62
 Awire|net@779|||1800|pin@312||-14|61|pin@367||-9.5|61
 Awire|net@781|||900|pms1@0|d|-9.5|78|pin@367||-9.5|61
 Awire|net@785|||900|pms1@1|d|-9.5|28|pin@369||-9.5|18.5
-Awire|net@787|||2700|nms1@0|d|-9.5|7|pin@369||-9.5|18.5
+Awire|net@787|||2700|nms1@0|d|-9.5|13|pin@369||-9.5|18.5
 Awire|net@789|||2700|nms1@1|d|-9.5|50|pin@367||-9.5|61
 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
@@ -605,12 +815,12 @@ Awire|net@799|||0|predCond@3|cond|-20.5|17.5|pin@375||-39|17.5
 Awire|net@801|||1800|pin@376||-39|35|fire@0|NotMSN[ZeroOrDone]|-39|35
 Awire|net@802|||2700|pin@375||-39|17.5|pin@376||-39|35
 Awire|net@809|||1800|pin@353||-67|41|fire@0|MSN[ZeroOrOne]|-39|41
-Awire|net@812|||0|predCond@5|state[1]|-63|63.5|pin@380||-67|63.5
+Awire|net@812|||0|predCond@5|state[1]|-63|72.5|pin@380||-67|72.5
 Awire|net@844|||2700|pin@395||-44|49|pin@397||-44|49.5
 Awire|net@845|||1800|sucDri20@1|cond|-46|49.5|pin@397||-44|49.5
-Awire|net@846|||2700|fire@0|fire|-26.5|48|pin@398||-26.5|64.5
-Awire|net@847|||900|pin@398||-26.5|64.5|pin@361||-26.5|62
-Awire|net@848|||1800|predCond@5|in[1]|-57.5|64.5|pin@398||-26.5|64.5
+Awire|net@846|||2700|fire@0|fire|-26.5|48|pin@398||-26.5|73.5
+Awire|net@847|||900|pin@398||-26.5|73.5|pin@361||-26.5|62
+Awire|net@848|||1800|predCond@5|in[1]|-57.5|73.5|pin@398||-26.5|73.5
 Awire|net@854|||1800|conn@7|y|-34.5|80.5|pin@401||-33|80.5
 Awire|net@855|||900|pin@401||-33|80.5|pin@373||-33|71
 Awire|net@856|||1800|conn@6|y|-34.5|83|pin@402||-29.5|83
@@ -621,61 +831,56 @@ Awire|net@958|||0|pin@457||-41|20|sucDri20@0|cond|-46|20
 Awire|net@968|||2700|nor2n@0|out|-60|30|inv@9|in|-60|32.5
 Awire|net@970|||1800|pin@463||-60|44.5|pin@435||-44|44.5
 Awire|net@985|||0|pin@471||-44.5|17.5|sucDri20@0|not_succ|-49.25|17.5
-Awire|net@989|||0|inv@14|in|-50.5|57.5|pin@473||-59|57.5
+Awire|net@989|||0|inv@14|in|-56.5|53.5|pin@473||-59|53.5
 Awire|net@990|||1800|pin@293||-67|50.5|pin@474||-59|50.5
-Awire|net@992|||900|pin@473||-59|57.5|pin@474||-59|50.5
+Awire|net@992|||900|pin@473||-59|53.5|pin@474||-59|50.5
 Awire|net@998|||1800|pin@478||-43|37|fire@0|NotMSN[ZeroOrOne]|-39|37
 Awire|net@1000|||0|pin@344||-35.5|51.5|sucDri20@1|in|-46|51.5
-Awire|net@1001|||2700|pin@335||-14|39|pin@479||-14|43.5
-Awire|net@1003|||1800|inv@15|in|-15.5|43.5|pin@479||-14|43.5
-Awire|net@1004|||0|inv@15|out|-20.5|43.5|pin@480||-22.5|43.5
+Awire|net@1001|||2700|pin@335||-14|39|pin@479||-14|41
+Awire|net@1003|||1800|inv@15|in|-15.5|41|pin@479||-14|41
+Awire|net@1004|||0|inv@15|out|-20.5|41|pin@480||-22.5|41
 Awire|net@1006|||0|pin@481||-22.5|41|fire@0|NotLSN[ZeroOrOne]|-23.5|41
-Awire|net@1007|||900|pin@480||-22.5|43.5|pin@481||-22.5|41
+Awire|net@1007|||900|pin@480||-22.5|41|pin@481||-22.5|41
 Awire|net@1009|||0|predCond@4|not_state|-18.5|64.5|pin@482||-22.5|64.5
-Awire|net@1010|||0|inv@16|out|-21|28|pin@483||-22|28
+Awire|net@1010|||0|inv@16|out|-21|35|pin@483||-22|35
 Awire|net@1012|||0|pin@484||-22|35|fire@0|NotLSN[ZeroOrDone]|-23.5|35
-Awire|net@1013|||2700|pin@483||-22|28|pin@484||-22|35
-Awire|net@1014|||900|pin@483||-22|28|pin@485||-22|22
+Awire|net@1013|||2700|pin@483||-22|35|pin@484||-22|35
+Awire|net@1014|||900|pin@483||-22|35|pin@485||-22|22
 Awire|net@1015|||0|predCond@3|not_state|-18.5|22|pin@485||-22|22
-Awire|net@1016|||2700|pin@308||-14|18.5|pin@486||-14|28
-Awire|net@1017|||2700|pin@486||-14|28|pin@305||-14|37
-Awire|net@1018|||1800|inv@16|in|-16|28|pin@486||-14|28
-Awire|net@1026|||2700|pin@479||-14|43.5|pin@491||-14|69.5
+Awire|net@1016|||2700|pin@308||-11.5|18.5|pin@486||-11.5|35
+Awire|net@1017|||2700|pin@486||-11.5|35|pin@305||-11.5|37
+Awire|net@1018|||1800|inv@16|in|-16|35|pin@486||-11.5|35
+Awire|net@1026|||2700|pin@479||-14|41|pin@491||-14|69.5
 Awire|net@1027|||900|pin@491||-14|69.5|pin@312||-14|61
 Awire|net@1028|||1800|nand2@0|ina|-15.5|69.5|pin@491||-14|69.5
-Awire|net@1029|||1800|nand2@0|inb|-15.5|71.5|pin@492||-13|71.5
-Awire|net@1030|||1800|pin@308||-14|18.5|pin@493||-13|18.5
-Awire|net@1031|||1800|pin@493||-13|18.5|pin@369||-9.5|18.5
-Awire|net@1032|||900|pin@492||-13|71.5|pin@493||-13|18.5
-Awire|net@1037|||1800|nand2@1|inb|-52|68|pin@495||-51|68
+Awire|net@1029|||1800|nand2@0|inb|-15.5|71.5|pin@492||-11.5|71.5
+Awire|net@1037|||1800|nand2@1|inb|-52|77|pin@495||-51|77
 Awire|net@1038|||1800|pin@474||-59|50.5|pin@496||-51|50.5
 Awire|net@1039|||0|pin@496||-51|50.5|pin@418||-71|50.5
-Awire|net@1042|||2700|pin@497||-39|35|pin@498||-39|66
-Awire|net@1043|||0|pin@498||-39|66|nand2@1|ina|-52|66
-Awire|net@1044|||0|nand2@1|out|-57|67|predCond@5|not_state|-60|67
+Awire|net@1042|||2700|pin@497||-39|35|pin@498||-39|75
+Awire|net@1043|||0|pin@498||-39|75|nand2@1|ina|-52|75
+Awire|net@1044|||0|nand2@1|out|-57|76|predCond@5|not_state|-60|76
 Awire|net@1046|||900|pin@499||-22.5|70.5|pin@482||-22.5|64.5
 Awire|net@1047|||0|nand2@0|out|-20.5|70.5|pin@499||-22.5|70.5
-Awire|net@1049|||900|pin@380||-67|63.5|pin@293||-67|50.5
+Awire|net@1049|||900|pin@380||-67|72.5|pin@293||-67|50.5
 Awire|net@1050|||2700|inv@9|out|-60|37.5|pin@501||-60|39
-Awire|net@1053|||1800|pin@451||-24.5|60|predCond@4|cond|-20.5|60
-Awire|net@1057|||1800|inv@14|out|-45.5|57.5|pin@477||-43|57.5
-Awire|net@1058|||900|pin@477||-43|57.5|pin@505||-43|47
+Awire|net@1057|||1800|inv@14|out|-51.5|53.5|pin@477||-43|53.5
+Awire|net@1058|||900|pin@477||-43|53.5|pin@505||-43|47
 Awire|net@1059|||900|pin@505||-43|47|pin@478||-43|37
 Awire|net@1061|||1800|sucDri20@1|not_succ|-49.25|47|pin@505||-43|47
-Awire|net@1062|||2700|pin@380||-67|63.5|pin@506||-67|72
-Awire|net@1063|||1800|pin@506||-67|72|pin@507||-51|72
-Awire|net@1064|||900|pin@507||-51|72|pin@495||-51|68
-Awire|net@1065|||1800|predCond@5|cond|-58|62.5|pin@508||-54.5|62.5
-Awire|net@1066|||900|pin@508||-54.5|62.5|pin@509||-54.5|59
-Awire|net@1068|||900|pin@510||-65|59|pin@466||-65|29
-Awire|net@1069|||0|pin@509||-54.5|59|pin@510||-65|59
-Awire|net@1073|||1800|LEload@0|a|-81.5|44|pin@511||-79|44
-Awire|net@1074|||1800|conn@2|y|-81|50.5|pin@512||-79|50.5
-Awire|net@1075|||1800|pin@512||-79|50.5|pin@418||-71|50.5
-Awire|net@1076|||2700|pin@511||-79|44|pin@512||-79|50.5
-Awire|net@1077|||1800|LEload@1|a|-81|26.5|pin@513||-79|26.5
-Awire|net@1078|||1800|conn@1|a|-82|21|pin@514||-79|21
-Awire|net@1080|||900|pin@513||-79|26.5|pin@514||-79|21
+Awire|net@1062|||2700|pin@380||-67|72.5|pin@506||-67|81
+Awire|net@1063|||1800|pin@506||-67|81|pin@507||-51|81
+Awire|net@1064|||900|pin@507||-51|81|pin@495||-51|77
+Awire|net@1065|||1800|predCond@5|cond|-58|71.5|pin@508||-54.5|71.5
+Awire|net@1066|||900|pin@508||-54.5|71.5|pin@509||-54.5|56.5
+Awire|net@1068|||900|pin@510||-65|56.5|pin@466||-65|29
+Awire|net@1069|||0|pin@509||-54.5|56.5|pin@510||-65|56.5
+Awire|net@1073|||1800|LEload@0|a|-93.5|44|pin@511||-91|44
+Awire|net@1074|||1800|conn@2|y|-93|50.5|pin@512||-91|50.5
+Awire|net@1076|||2700|pin@511||-91|44|pin@512||-91|50.5
+Awire|net@1077|||1800|LEload@1|a|-93|26.5|pin@513||-91|26.5
+Awire|net@1078|||1800|conn@1|a|-94|21|pin@514||-91|21
+Awire|net@1080|||900|pin@513||-91|26.5|pin@514||-91|21
 Awire|net@1081|||0|LEload@2|a|-5.5|11|pin@515||-7.5|11
 Awire|net@1082|||1800|pin@369||-9.5|18.5|pin@516||-7.5|18.5
 Awire|net@1083|||1800|pin@516||-7.5|18.5|conn@0|a|-3.5|18.5
@@ -687,14 +892,8 @@ Awire|net@1088|||900|pin@517||-7|67.5|pin@518||-7|61
 Awire|net@1091|||2700|pin@296||-53|21|pin@521||-53|35
 Awire|net@1092|||2700|pin@521||-53|35|pin@351||-53|39
 Awire|net@1093|||0|inv@19|in|-51|35|pin@521||-53|35
-Awire|net@1105|||0|pin@296||-53|21|pin@526||-56|21
-Awire|net@1107|||900|pin@526||-56|21|pin@527||-56|9
-Awire|net@1109|||2700|pin@528||-24.5|9|pin@451||-24.5|60
-Awire|net@1110|||1800|pin@527||-56|9|pin@528||-24.5|9
 Awire|net@1114|||2700|pin@501||-60|39|pin@463||-60|44.5
-Awire|net@1115|||0|pin@526||-56|21|pin@531||-59|21
 Awire|net@1117|||900|nor2n@0|ina|-59|25|pin@531||-59|21
-Awire|net@1121|||1800|pin@514||-79|21|pin@531||-59|21
 Awire|net@1131|||1800|pin@471||-44.5|17.5|pin@375||-39|17.5
 Awire|net@1132|||0|pin@376||-39|35|inv@19|out|-46|35
 Awire|net@1133|||0|pin@497||-39|35|inv@19|out|-46|35
@@ -702,11 +901,29 @@ Awire|net@1134|||1800|pin@534||-65|14|pin@537||-41|14
 Awire|net@1135|||900|pin@457||-41|20|pin@537||-41|14
 Awire|net@1141|||0|sucDri20@1|succ|-50|50.5|pin@293||-67|50.5
 Awire|net@1142|||900|delay@1|out|-71|31.5|pin@540||-71|23
-Awire|net@1143|||900|pin@510||-65|59|pin@541||-65|23
-Awire|net@1144|||900|pin@541||-65|23|pin@534||-65|14
 Awire|net@1145|||1800|pin@540||-71|23|pin@541||-65|23
-Awire|net@1146|||900|nor2n@0|inb|-61|25|pin@542||-61|23
-Awire|net@1148|||1800|pin@541||-65|23|pin@542||-61|23
+Awire|net@1152|||900|inv@21|out|-81.5|36.5|inv@20|in|-81.5|35
+Awire|net@1153|||1800|pin@512||-91|50.5|pin@545||-81.5|50.5
+Awire|net@1154|||1800|pin@545||-81.5|50.5|pin@418||-71|50.5
+Awire|net@1155|||2700|inv@21|in|-81.5|41.5|pin@545||-81.5|50.5
+Awire|net@1156|||900|inv@20|out|-81.5|30|pin@546||-81.5|26
+Awire|net@1160|||900|nor2n@0|inb|-61|25|pin@542||-61|23
+Awire|net@1161|||1800|pin@541||-65|23|pin@542||-61|23
+Awire|net@1162|||900|pin@510||-65|56.5|pin@548||-65|26
+Awire|net@1165|||1800|pin@308||-11.5|18.5|pin@369||-9.5|18.5
+Awire|net@1166|||1800|fire@0|LSN[ZeroOrDone]|-23.5|37|pin@549||-11.5|37
+Awire|net@1167|||1800|pin@549||-11.5|37|pin@305||-11.5|37
+Awire|net@1168|||2700|pin@549||-11.5|37|pin@492||-11.5|71.5
+Awire|net@1169|||900|pin@548||-65|26|pin@541||-65|23
+Awire|net@1172|||900|pin@541||-65|23|pin@534||-65|14
+Awire|net@1173|||0|pin@296||-53|21|pin@531||-59|21
+Awire|net@1176|||900|pin@546||-81.5|26|pin@552||-81.5|23
+Awire|net@1182|||0|predCond@4|cond|-20.5|60|pin@554||-76|60
+Awire|net@1183|||900|inv@23|in|-76|32.5|inv@22|out|-76|31
+Awire|net@1184|||1800|pin@514||-91|21|pin@555||-76|21
+Awire|net@1185|||1800|pin@555||-76|21|pin@531||-59|21
+Awire|net@1186|||900|inv@22|in|-76|26|pin@555||-76|21
+Awire|net@1187|||2700|inv@23|out|-76|37.5|pin@554||-76|60
 Awire|not_load_zero|D5G2;X-3.5;||0|pms1@0|g|-12.5|80|pin@368||-20|80
 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
@@ -720,7 +937,7 @@ Eload_one|not_load_zero|D5G2;X-8;|conn@4|a|I
 X
 
 # Cell predCondMSC;1{ic}
-CpredCondMSC;1{ic}||artwork|1227921780535|1247800686457|E
+CpredCondMSC;1{ic}||artwork|1227921780535|1247808250585|E|ATTR_X(D5G1;HNP)S@X
 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]
@@ -769,7 +986,7 @@ Estate[1]|state|D5G2;X2.5;|pin@6||B
 X
 
 # Cell predCondMSC;1{sch}
-CpredCondMSC;1{sch}||schematic|1227920907034|1247800611710|
+CpredCondMSC;1{sch}||schematic|1227920907034|1247808339678||ATTR_X(D5G4;HNPX-23;Y28;)S@X
 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
@@ -777,7 +994,7 @@ NOff-Page|conn@0||-23|0.5||||
 NOff-Page|conn@2||42.75|0.5|||X|
 NOff-Page|conn@4||9.5|-10|||X|
 NOff-Page|conn@5||12|12|||RR|
-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
+IredFive:nms2b;1{ic}|nms2b@0||-6.5|-10|X||D5G4;|ATTR_Delay(D5G1;NPX3;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX-2.25;)S@X
 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|