refactored some logic
[fleet.git] / electric / omegaCounter.jelib
index 17fd243..fb0b28b 100644 (file)
@@ -80,7 +80,7 @@ Eout||D5G2;|conn@0|y|O
 X
 
 # Cell fire;3{ic}
-Cfire;3{ic}||artwork|1247529105994|1248130859819|E
+Cfire;3{ic}||artwork|1247529105994|1248131451191|E|ATTR_X(D5G1;HNOLP)S20
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NThick-Circle|art@11||2.5|0|4|4|||ART_color()I10|ART_degrees()F[0.0,3.1415927]
 NThick-Circle|art@18||0.25|3|4.5|4|||ART_color()I10|ART_degrees()F[0.0,3.1415927]
@@ -157,7 +157,7 @@ EfireHI||D5G1;RX2;|pin@16||O
 X
 
 # Cell fire;2{ic}
-Cfire;2{ic}||artwork|1247529105994|1248130549686|E
+Cfire;2{ic}||artwork|1247529105994|1248131451191|E|ATTR_X(D5G1;HNOLP)S20
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NThick-Circle|art@4||-1.75|1.5|1|1|R||ART_color()I10
 NThick-Circle|art@11||2|0|4|4|||ART_color()I10|ART_degrees()F[0.0,3.1415927]
@@ -238,7 +238,7 @@ EfireHI||D5G1;RX2;|pin@16||O
 X
 
 # Cell fire;1{ic}
-Cfire;1{ic}||artwork|1247529105994|1248130315089|E
+Cfire;1{ic}||artwork|1247529105994|1248131451191|E|ATTR_X(D5G1;HNOLP)S20
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NThick-Circle|art@4||2|0.5|1|1|R||ART_color()I10
 NThick-Circle|art@11||2|-2|4|4|||ART_color()I10|ART_degrees()F[0.0,3.1415927]
@@ -313,7 +313,7 @@ Efire[1]|fireHI|D5G1;RX1.5;|pin@16||O
 X
 
 # Cell fire;1{sch}
-Cfire;1{sch}||schematic|1247526811643|1248130870691|
+Cfire;1{sch}||schematic|1247526811643|1248136725603||ATTR_X(D5G1;HNOLPX-57;Y31.5;)S20
 IredFive:PMOS;1{ic}|PMOS@2||-16.5|21|RR||D5G4;|ATTR_X(D5G1.5;NOLPX-1.5;Y-3.5;)S@X*2
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@2||-41|8|||XYRR|
@@ -325,9 +325,9 @@ NOff-Page|conn@14||-1.5|-19|||YRRR|
 Ifire;1{ic}|fireIvan@0||-80.5|50|||D5G4;
 Ifire;2{ic}|fireIvan@1||-69.5|48.5|||D5G4;
 Ifire;3{ic}|fireIvan@2||-56.5|48.5|||D5G4;
-IredFive:nms1;2{ic}|nms1@0||-16.5|12|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.5;Y-4.25;)S@X
+IredFive:nms1;2{ic}|nms1@0||-16.5|12|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.5;Y-4.25;)S2*@X
 IredFive:nms2a;2{ic}|nms2a@1||-28.5|8|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1;Y-6;)S@X
-IredFive:nms3a;1{ic}|nms3a@1||-7|4|X||D5G4;|ATTR_X(D5G1.5;NOLPX1;Y-8;)S0.5*@X
+IredFive:nms3a;1{ic}|nms3a@1||-7|4|X||D5G4;|ATTR_X(D5G1.5;NOLPX1;Y-8;)S0.6*@X
 NWire_Pin|pin@66||-1.5|30||||
 NWire_Pin|pin@67||-1.5|4||||
 NWire_Pin|pin@68||6|30||||
@@ -352,10 +352,10 @@ NWire_Pin|pin@91||-12|12||||
 NWire_Pin|pin@92||-12|21||||
 NWire_Pin|pin@93||-12|16.5||||
 NWire_Pin|pin@94||-7|16.5||||
-Ngeneric:Invisible-Pin|pin@95||28.5|15|||||ART_message(D5G1;)S[Order of these is swapped because the fall,"of ZeroOrDone \"matters more\" (??)"]
-IredFive:pms1;2{ic}|pms1@0||-7|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.75;Y3.5;)S0.5*@X
-IredFive:pms1;2{ic}|pms1@1||1|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.75;Y3.5;)S0.5*@X
-IredFive:pms1;2{ic}|pms1@2||9|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.75;Y3.5;)S0.5*@X
+Ngeneric:Invisible-Pin|pin@96||10|37.5|||||ART_message(D5G1;)S[these pullups and the pull-down they drive,are extra-powerful in order to ensure,that the fire signal goes away promptly.]
+IredFive:pms1;2{ic}|pms1@0||-7|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.75;Y3.5;)S0.6*@X
+IredFive:pms1;2{ic}|pms1@1||1|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.75;Y3.5;)S1.5*@X
+IredFive:pms1;2{ic}|pms1@2||9|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.75;Y3.5;)S1.5*@X
 IredFive:pms1;2{ic}|pms1@3||-38.5|30|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.25;Y4;)S@X*2
 IredFive:pms1;2{ic}|pms1@4||-28.5|30|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.25;Y4;)S@X*2
 Awire|net@169|||1800|pms1@0|g|-4|30|pin@66||-1.5|30
@@ -410,6 +410,68 @@ Edisable|disableLO|D5G2;X-1.5;|conn@14|a|I
 Efire[1]|fireHI|D6G2;X4.5;|conn@8|a|O
 X
 
+# Cell nand2withInverter;1{ic}
+Cnand2withInverter;1{ic}||artwork|1021415734000|1248139184888|E|ATTR_Delay(D5G1;HNPX-2.5;Y5.5;)I100|ATTR_X(D5FLeave alone;G1;HNOLPX-2.5;Y6.5;)S1|ATTR_drive0(D5G1;HNPTX-2.5;Y4.5;)Sstrong0|ATTR_drive1(D5G1;HNPTX-2.5;Y3.5;)Sstrong1|prototype_center()I[6000,0]
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NThick-Circle|art@1||-1|1|1|1|||ART_color()I10
+NThick-Circle|art@4||-3|-1|1|1|||ART_color()I10
+NThick-Circle|art@6||-1|-2|8|7|YRRR||ART_color()I10|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@7||-1|2|8|7|RRR||ART_color()I10|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@8||-3.25|0|6|6|3200||ART_color()I10|ART_degrees()I800
+NPin|pin@6||-1.5|1|1|1||
+NPin|pin@7||-2.5|1||||
+Nschematic:Bus_Pin|pin@8||3.5|0|-2|-2||
+Nschematic:Bus_Pin|pin@9||-2.5|1|-2|-2||
+Nschematic:Bus_Pin|pin@12||-7|-1|-2|-2||
+NPin|pin@13||-3.5|-1|1|1||
+Nschematic:Bus_Pin|pin@14||-7|-1|-2|-2||
+NPin|pin@15||-6|-1|1|1||
+NPin|pin@16||-7|-1||||
+Nschematic:Bus_Pin|pin@17||-2.5|-1|-2|-2||
+NPin|pin@18||-6|0.5|1|1||
+NPin|pin@19||-6|-2.5|1|1||
+NPin|pin@20||-2.5|-1|1|1||
+NPin|pin@21||-0.5|-1|1|1||
+NPin|pin@22||-1.5|-3|1|1|R|
+NPin|pin@23||-1.5|-1|1|1|R|
+Nschematic:Wire_Pin|pin@24||-1.5|-3||||
+Nschematic:Bus_Pin|pin@27||-2|-1|-2|-2||
+NPin|pin@28||-0.5|-1|1|1||
+NPin|pin@29||-2|-1||||
+Nschematic:Bus_Pin|pin@30||-2|1|-2|-2||
+Nschematic:Bus_Pin|pin@31||3|0|-2|-2||
+NPin|pin@34||-0.5|-1.25|1|1||
+NPin|pin@35||0|-1.75|1|1||
+AThicker|net@4|||FS0|pin@6||-1.5|1|pin@7||-2.5|1|ART_color()I10
+AThicker|net@6|||FS3290|pin@13||-3.5|-1|pin@18||-6|0.5|ART_color()I10
+AThicker|net@7|||FS310|pin@13||-3.5|-1|pin@19||-6|-2.5|ART_color()I10
+AThicker|net@8|||FS0|pin@15||-6|-1|pin@16||-7|-1|ART_color()I10
+AThicker|net@9|||FS2700|pin@19||-6|-2.5|pin@18||-6|0.5|ART_color()I10
+AThicker|net@10|||FS1800|pin@20||-2.5|-1|pin@21||-0.5|-1|ART_color()I-16777215
+AThicker|net@11|||FS2700|pin@22||-1.5|-3|pin@23||-1.5|-1|ART_color()I-16777215
+AThicker|net@13|||FS0|pin@28||-0.5|-1|pin@29||-2|-1|ART_color()I10
+AThicker|net@15|||FS3150|pin@35||0|-1.75|pin@34||-0.5|-1.25|ART_color()I10
+Eina||D5G1;X1.5;|pin@12||I
+Einb||D5G1;|pin@9||I
+Eout||D5G1;|pin@8||O
+EoutaBar||D5G1;Y-0.5;|pin@24||U
+X
+
+# Cell nand2withInverter;1{sch}
+Cnand2withInverter;1{sch}||schematic|1021415734000|1248139326935||ATTR_Delay(D5G1;HNPX-18;Y-6;)I100|ATTR_X(D5FLeave alone;G1;HNOLPX-18;Y-5;)S1|ATTR_drive0(D5G1;HNPTX-18;Y-7;)Sstrong0|ATTR_drive1(D5G1;HNPTX-18;Y-8;)Sstrong1|ATTR_verilog_template(D5G1;NTX5.5;Y-18.5;)SFIXME!!! nor ($(drive0), $(drive1)) #($(Delay)) $(node_name) ($(out), $(ina), $(inb));|prototype_center()I[0,0]
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NOff-Page|conn@0||-15.5|0||||
+NOff-Page|conn@1||14|-8|||RR|
+NOff-Page|conn@2||14|0||||
+NOff-Page|conn@3||14|15||||
+Inand2withInverter;1{ic}|nand2wit@0||33.5|16|||D5G4;|ATTR_Delay(D5G1;NPX-5.25;Y-4;)I100|ATTR_X(D5FLeave alone;G1;NOLPX-5.25;Y-3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+Ngeneric:Invisible-Pin|pin@8||3|28.5|||||ART_message(D5G6;)Snand2withInverters
+Eina||D5G2;X-1.5;|conn@0|a|I
+Einb||D5G2;X-2.5;|conn@1|a|I
+Eout||D5G2;X2.5;|conn@2|y|O
+EoutaBar||D5G2;X7.5;|conn@3|a|U
+X
+
 # Cell nor2withInverter;2{ic}
 Cnor2withInverter;2{ic}||artwork|1021415734000|1246318194856|E|ATTR_Delay(D5G1;HNPX-2.5;Y5.5;)I100|ATTR_X(D5FLeave alone;G1;HNOLPX-2.5;Y6.5;)S1|ATTR_drive0(D5G1;HNPTX-2.5;Y4.5;)Sstrong0|ATTR_drive1(D5G1;HNPTX-2.5;Y3.5;)Sstrong1|prototype_center()I[6000,0]
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -460,12 +522,12 @@ EoutaBar||D5G1;Y-0.5;|pin@24||U
 X
 
 # Cell nor2withInverter;1{sch}
-Cnor2withInverter;1{sch}||schematic|1021415734000|1246318014836||ATTR_Delay(D5G1;HNPX-18;Y-6;)I100|ATTR_X(D5FLeave alone;G1;HNOLPX-18;Y-5;)S1|ATTR_drive0(D5G1;HNPTX-18;Y-7;)Sstrong0|ATTR_drive1(D5G1;HNPTX-18;Y-8;)Sstrong1|ATTR_verilog_template(D5G1;NTX5.5;Y-18.5;)SFIXME!!! nor ($(drive0), $(drive1)) #($(Delay)) $(node_name) ($(out), $(ina), $(inb));|prototype_center()I[0,0]
-IorangeTSMC090nm:NMOSx;1{ic}|NMOS@0||-4|-8|||D0G4;|ATTR_Delay(D5G1;NOJPX3.5;Y-2;)S@Delay|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;Y0.5;)S@X
-IorangeTSMC090nm:NMOSx;1{ic}|NMOS@1||4|-8|YRR||D0G4;|ATTR_Delay(D5G1;NOJPX3.5;Y-2;)S@Delay|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;Y0.5;)S@X
+Cnor2withInverter;1{sch}||schematic|1021415734000|1248139236251||ATTR_Delay(D5G1;HNPX-18;Y-6;)I100|ATTR_X(D5FLeave alone;G1;HNOLPX-18;Y-5;)S1|ATTR_drive0(D5G1;HNPTX-18;Y-7;)Sstrong0|ATTR_drive1(D5G1;HNPTX-18;Y-8;)Sstrong1|ATTR_verilog_template(D5G1;NTX5.5;Y-18.5;)SFIXME!!! nor ($(drive0), $(drive1)) #($(Delay)) $(node_name) ($(out), $(ina), $(inb));|prototype_center()I[0,0]
+IorangeTSMC090nm:NMOSx;1{ic}|NMOS@0||-4|-8|||D0G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;Y0.5;)S@X
+IorangeTSMC090nm:NMOSx;1{ic}|NMOS@1||4|-8|YRR||D0G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;Y0.5;)S@X
 IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@0||-3|11.5|Y||D0G4;|ATTR_Delay(D5G1;NOJPX3.5;Y-2;)S@Delay|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;Y0.5;)S@X
-IredFive:PMOS;1{ic}|PMOS@0||0|20.5|||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_X(D5G1.5;NPX5;Y0.5;)I1
-IredFive:PMOS;1{ic}|PMOS@1||0|4|RR||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_X(D5G1.5;NPX5;Y0.5;)I1
+IredFive:PMOS;1{ic}|PMOS@0||0|20.5|||D5G4;|ATTR_X(D5G1.5;NPX5;Y0.5;)I1
+IredFive:PMOS;1{ic}|PMOS@1||0|4|RR||D5G4;|ATTR_X(D5G1.5;NPX5;Y0.5;)I1
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-15.5|0||||
 NOff-Page|conn@1||14|-8|||RR|
@@ -533,7 +595,7 @@ EoutaBar||D5G2;X7.5;|conn@3|a|U
 X
 
 # Cell oneBit;1{ic}
-ConeBit;1{ic}||artwork|1242937501096|1248130986199|E
+ConeBit;1{ic}||artwork|1242937501096|1248134933359|E
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NTriangle|art@2||3|2|3|2|R|
 NTriangle|art@3||3|-8|3|2|R|
@@ -560,55 +622,46 @@ ELSN[ZeroOrDone]||D5G1;X5;|pin@17||B
 ELSN[ZeroOrTwo]||D6G1;X1;|pin@16||B
 EMSN[ZeroOrDone]||D4G1;X-1;|pin@18||B
 EMSN[ZeroOrTwo]||D4G1;X-1;|pin@9||B
-Edisable||D5G2;X-2;Y-2;|pin@38||I
+Edisable|disableLO|D5G2;X-2;Y-2;|pin@38||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1248130887422|
+ConeBit;1{sch}||schematic|1242942044308|1248139502448|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||1.5|17.5||||
 NOff-Page|conn@1||-87|19.5|||RR|
-NOff-Page|conn@2||-86|49.5||||
+NOff-Page|conn@2||-86|55||||
 NOff-Page|conn@3||2|61||||
-NOff-Page|conn@8||-11.5|41.5|||RR|
-Ifire;3{ic}|fireIvan@3||-28|51|||D5G4;
-IredFive:inv;1{ic}|inv@9||-66.5|48.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+NOff-Page|conn@8||-18|41.5|||RR|
+Ifire;3{ic}|fireIvan@3||-28|48|||D5G4;|ATTR_X(D5G2;NOLPX6.25;Y2;)S8
 IredFive:inv;1{ic}|inv@22||-66.5|14.5|RR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@33||-66.5|18.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-4;Y-1.5;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@34||-66.5|53|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY-3;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@35||-61.5|66.5|RR||D0G4;|ATTR_X(D5G1.5;NPX-3;Y-3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@37||-17|14.5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@38||-61.5|23|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@39||-66.5|23|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@40||-51.5|49.5|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@42||-51.5|23|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@43||-56.5|23|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@44||-66.5|44|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@44||-66.5|44|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.5;Y-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@45||-61.5|62|X||D0G4;|ATTR_X(D5G1.5;NPX-3;Y1.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@46||-66.5|62|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@47||-56.5|49.5|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@48||-17|21.5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX2;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@50||-18.5|41.5|RR||D0G4;|ATTR_X(D5G1.5;NPX1;Y2;)S8|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@62||-56.5|14.5|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@63||-61.5|14.5|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@64||-41|23|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@65||-46|23|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@49||-60|47.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@50||-54|49.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:invLT;1{ic}|invLT@0||-66.5|18.5|RR||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX-4;Y-1.5;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:invLT;1{ic}|invLT@1||-66.5|53|RR||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPY-3;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@1||-66.5|67.5|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1.5;Y3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:nand2LT;1{ic}|nand2LT@0||-9|72.5|YRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX4;Y2;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:nor2n;1{ic}|nor2n@0||-61.5|48.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1;Y-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nand2;1{ic}|nand2@2||-66.5|48.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1;Y-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nand2LT;1{ic}|nand2LT@0||-9|72.5|YRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX4;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IoneBit;1{ic}|oneBitIv@0||-109|69.5|||D5G4;
 Ngeneric:Invisible-Pin|pin@6||-84|110.5|||||ART_message(D5G15;)SoneBit
 Ngeneric:Invisible-Pin|pin@149||-84.5|100|||||ART_message(D5G2;)Sam 13 Jul 2009
 Ngeneric:Invisible-Pin|pin@162||-21|104.5|||||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||-105|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@194||-112.5|39.5|||||ART_message(D5G4;)SMSB to the Left
+Ngeneric:Invisible-Pin|pin@195||27|39.5|||||ART_message(D5G4;)SLSB to the Right
 Ngeneric:Invisible-Pin|pin@196||-83.5|102.5|||||ART_message(D5G2;)S"this GasP module sits \"between\" two bits"
 Ngeneric:Invisible-Pin|pin@226||-97|89.5|||||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||-64.5|4|||||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||-64.5|76|||||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||-29.5|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||-30.5|80|||||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||-80|49.5||||
 NWire_Pin|pin@305||-2.5|37||||
 NWire_Pin|pin@308||-5|17.5||||
 NWire_Pin|pin@312||-5|61||||
@@ -626,7 +679,6 @@ NWire_Pin|pin@572||-70|15.5||||
 NWire_Pin|pin@575||-27.75|58||||
 NWire_Pin|pin@597||-43|14.5||||
 NWire_Pin|pin@598||-70|14.5||||
-NWire_Pin|pin@601||-83.5|49.5||||
 NWire_Pin|pin@608||-72|50.5||||
 NWire_Pin|pin@622||-82|9||||
 NWire_Pin|pin@623||-82|19.5||||
@@ -634,7 +686,7 @@ NWire_Pin|pin@625||-62.5|53||||
 NWire_Pin|pin@626||-62.5|58||||
 NWire_Pin|pin@627||-70|20.5||||
 NWire_Pin|pin@630||-82|72.5||||
-NWire_Pin|pin@631||-82|49.5||||
+NWire_Pin|pin@631||-82|55||||
 NWire_Pin|pin@632||-2.5|33||||
 NWire_Pin|pin@633||-46|66.5||||
 NWire_Pin|pin@636||-43|45||||
@@ -649,8 +701,8 @@ NWire_Pin|pin@658||-43|44||||
 NWire_Pin|pin@659||-82|33||||
 NWire_Pin|pin@660||-43|68.5||||
 NWire_Pin|pin@661||-82|61||||
-NWire_Pin|pin@662||-20|21.5||||
-NWire_Pin|pin@663||-20|33||||
+NWire_Pin|pin@662||-22.5|21.5||||
+NWire_Pin|pin@663||-22.5|33||||
 NWire_Pin|pin@664||-5|33||||
 NWire_Pin|pin@666||-47.5|62||||
 NWire_Pin|pin@667||-47.5|49.5||||
@@ -672,15 +724,20 @@ NWire_Pin|pin@687||-30.75|41.5||||
 NWire_Pin|pin@688||-43|41.5||||
 NWire_Pin|pin@689||-28.75|33||||
 NWire_Pin|pin@691||-24|41.5||||
-NWire_Pin|pin@702||-58|47.5||||
-NWire_Pin|pin@705||-46|47.5||||
-NWire_Pin|pin@706||-36.5|23||||
-NWire_Pin|pin@707||-36.5|27.5||||
-NWire_Pin|pin@708||-43|27.5||||
 NWire_Pin|pin@710||-46|62||||
 NWire_Pin|pin@713||-23|62||||
 NWire_Pin|pin@714||-33|62||||
 NWire_Pin|pin@716||-19.5|14.5||||
+NWire_Pin|pin@717||-48.5|23||||
+NWire_Pin|pin@719||-43|23||||
+NWire_Pin|pin@720||-82|49.5||||
+NWire_Pin|pin@723||-54|14.5||||
+NWire_Pin|pin@724||-64|14.5||||
+NWire_Pin|pin@725||-59|23||||
+NWire_Pin|pin@726||-49|23||||
+NWire_Pin|pin@728||-49|49.5||||
+NWire_Pin|pin@729||-69|48.5||||
+NWire_Pin|pin@730||-46|47.5||||
 IpredCond;1{ic}|predCond@4||-9|61|||D5G4;|ATTR_X(D5G2;NPX0.75;Y-5.25;)S8
 IpredCond;1{ic}|predCond@7||-75|61|YRR||D5G4;|ATTR_X(D5G2;NPX2.25;Y-5.25;)S8
 IpredCond;2{ic}|predCond@10||-9|17.5|||D5G4;|ATTR_X(D5G2;NPX0.25;Y-5.25;)S8
@@ -703,21 +760,16 @@ Awire|net@1271|||1800|pin@308||-5|17.5|conn@0|a|-0.5|17.5
 Awire|net@1275|||0|conn@3|a|0|61|pin@312||-5|61
 Awire|net@1305|||2700|pin@598||-70|14.5|pin@572||-70|15.5
 Awire|net@1306|||0|inv@22|out|-69|14.5|pin@598||-70|14.5
-Awire|net@1319|||1800|pin@601||-83.5|49.5|pin@293||-80|49.5
-Awire|net@1325|||0|inv@9|out|-69|48.5|sucDri20@1|cond|-72|48.5
-Awire|net@1326|||0|nor2n@0|out|-64|48.5|inv@9|in|-64|48.5
 Awire|net@1339|||1800|sucDri20@1|in|-72|50.5|pin@608||-72|50.5
-Awire|net@1355|||0|sucDri20@1|succ|-77|49.5|pin@601||-83.5|49.5
 Awire|net@1370|||0|succCond@0|state|-76.5|19.5|pin@623||-82|19.5
 Awire|net@1371|||0|pin@623||-82|19.5|conn@1|a|-85|19.5
 Awire|net@1372|||2700|pin@622||-82|9|pin@623||-82|19.5
-Awire|net@1375|||1800|inv@34|in|-64|53|pin@625||-62.5|53
+Awire|net@1375|||1800|invLT@1|in|-64|53|pin@625||-62.5|53
 Awire|net@1376|||0|pin@575||-27.75|58|pin@626||-62.5|58
 Awire|net@1378|||2700|pin@625||-62.5|53|pin@626||-62.5|58
 Awire|net@1384|||0|pin@627||-70|20.5|succCond@0|cond|-71.5|20.5
-Awire|net@1385|||0|inv@33|out|-69|18.5|succCond@0|in|-71.5|18.5
-Awire|net@1392|||0|pin@293||-80|49.5|pin@631||-82|49.5
-Awire|net@1393|||0|pin@631||-82|49.5|conn@2|y|-84|49.5
+Awire|net@1385|||0|invLT@0|out|-69|18.5|succCond@0|in|-71.5|18.5
+Awire|net@1393|||0|pin@631||-82|55|conn@2|y|-84|55
 Awire|net@1395|||900|pin@492||-2.5|73.5|pin@632||-2.5|33
 Awire|net@1407|||0|pin@633||-46|66.5|inv@35|in|-59|66.5
 Awire|net@1408|||1800|nand2@1|ina|-64|66.5|inv@35|out|-64|66.5
@@ -726,15 +778,11 @@ Awire|net@1434|||1800|pin@622||-82|9|pin@639||-43|9
 Awire|net@1439|||0|pin@572||-70|15.5|succCond@0|keep_down|-73.25|15.5
 Awire|net@1451|||0|inv@39|in|-64|23|inv@38|out|-64|23
 Awire|net@1452|||0|inv@39|out|-69|23|pin@649||-70|23
-Awire|net@1458|||0|inv@40|out|-54|49.5|inv@47|in|-54|49.5
-Awire|net@1464|||0|inv@43|out|-59|23|inv@38|in|-59|23
-Awire|net@1465|||0|inv@42|out|-54|23|inv@43|in|-54|23
 Awire|net@1471|||900|pin@505||-70.5|46|pin@657||-70.5|44
 Awire|net@1473|||0|inv@44|out|-69|44|pin@657||-70.5|44
 Awire|net@1474|||900|pin@636||-43|45|pin@658||-43|44
 Awire|net@1475|||2700|pin@658||-43|44|pin@653||-43|49.5
 Awire|net@1476|||1800|inv@44|in|-64|44|pin@658||-43|44
-Awire|net@1478|||0|nor2n@0|ina|-59|49.5|inv@47|out|-59|49.5
 Awire|net@1481|||0|inv@45|out|-64|62|inv@46|in|-64|62
 Awire|net@1484|||0|pin@640||-46|33|pin@659||-82|33
 Awire|net@1485|||2700|pin@623||-82|19.5|pin@659||-82|33
@@ -742,20 +790,19 @@ Awire|net@1487|||2700|pin@653||-43|49.5|pin@660||-43|68.5
 Awire|net@1488|||2700|pin@660||-43|68.5|pin@637||-43|69
 Awire|net@1489|||1800|nand2@1|inb|-64|68.5|pin@660||-43|68.5
 Awire|net@1491|||900|pin@630||-82|72.5|pin@661||-82|61
-Awire|net@1492|||900|pin@661||-82|61|pin@631||-82|49.5
+Awire|net@1492|||900|pin@661||-82|61|pin@631||-82|55
 Awire|net@1493|||0|pin@380||-80|61|pin@661||-82|61
 Awire|net@1497|||0|inv@46|out|-69|62|predCond@7|cond|-72|62
 Awire|net@1501|||1800|pin@630||-82|72.5|pin@638||-43|72.5
 Awire|net@1504|||0|predCond@10|not_keep_up|-11.5|21.5|inv@48|out|-14.5|21.5
-Awire|net@1505|||0|inv@48|in|-19.5|21.5|pin@662||-20|21.5
-Awire|net@1506|||2700|pin@662||-20|21.5|pin@663||-20|33
+Awire|net@1505|||0|inv@48|in|-19.5|21.5|pin@662||-22.5|21.5
+Awire|net@1506|||2700|pin@662||-22.5|21.5|pin@663||-22.5|33
 Awire|net@1507|||2700|pin@308||-5|17.5|pin@664||-5|33
-Awire|net@1509|||1800|pin@663||-20|33|pin@664||-5|33
+Awire|net@1509|||1800|pin@663||-22.5|33|pin@664||-5|33
 Awire|net@1514|||1800|inv@45|in|-59|62|pin@666||-47.5|62
-Awire|net@1515|||1800|inv@40|in|-49|49.5|pin@667||-47.5|49.5
 Awire|net@1516|||1800|pin@667||-47.5|49.5|pin@653||-43|49.5
 Awire|net@1517|||900|pin@666||-47.5|62|pin@667||-47.5|49.5
-Awire|net@1518|||0|inv@34|out|-69|53|pin@668||-70.5|53
+Awire|net@1518|||0|invLT@1|out|-69|53|pin@668||-70.5|53
 Awire|net@1519|||900|pin@668||-70.5|53|pin@669||-70.5|50.5
 Awire|net@1520|||0|pin@669||-70.5|50.5|pin@608||-72|50.5
 Awire|net@1521|||2700|pin@627||-70|20.5|pin@649||-70|23
@@ -768,52 +815,57 @@ Awire|net@1527|||0|pin@673||-70|65|predCond@7|not_state|-72.5|65
 Awire|net@1528|||1800|predCond@7|in[1]|-72|60|pin@674||-70|60
 Awire|net@1529|||900|pin@674||-70|60|pin@675||-70|58
 Awire|net@1530|||0|pin@626||-62.5|58|pin@675||-70|58
-Awire|net@1531|||2700|fireIvan@3|fireHI|-27.75|57|pin@575||-27.75|58
+Awire|net@1531|||2700|fireIvan@3|fireHI|-27.75|54|pin@575||-27.75|58
 Awire|net@1533|||2700|pin@676||-14|58|pin@677||-14|60
 Awire|net@1534|||1800|pin@677||-14|60|predCond@4|in[1]|-12|60
 Awire|net@1552|||0|pin@575||-27.75|58|pin@682||-34.5|58
 Awire|net@1553|||1800|pin@682||-34.5|58|pin@676||-14|58
-Awire|net@1554|||1800|inv@33|in|-64|18.5|pin@683||-34.5|18.5
+Awire|net@1554|||1800|invLT@0|in|-64|18.5|pin@683||-34.5|18.5
 Awire|net@1555|||1800|pin@683||-34.5|18.5|predCond@10|fire|-12|18.5
 Awire|net@1556|||900|pin@682||-34.5|58|pin@683||-34.5|18.5
 Awire|net@1559|||0|pin@632||-2.5|33|pin@664||-5|33
-Awire|net@1560|||0|pin@663||-20|33|pin@684||-25.5|33
-Awire|net@1561|||900|fireIvan@3|LSN[ZeroOrDone]|-25.5|49|pin@684||-25.5|33
+Awire|net@1560|||0|pin@663||-22.5|33|pin@684||-25.5|33
+Awire|net@1561|||900|fireIvan@3|LSN[ZeroOrDone]|-25.5|46|pin@684||-25.5|33
 Awire|net@1562|||0|pin@479||-5|36.5|pin@685||-27|36.5
-Awire|net@1563|||900|fireIvan@3|LSN[ZeroOrTwo]|-27|49|pin@685||-27|36.5
-Awire|net@1567|||900|fireIvan@3|MSN[ZeroOrTwo]|-30.75|48.5|pin@687||-30.75|41.5
+Awire|net@1563|||900|fireIvan@3|LSN[ZeroOrTwo]|-27|46|pin@685||-27|36.5
+Awire|net@1567|||900|fireIvan@3|MSN[ZeroOrTwo]|-30.75|45.5|pin@687||-30.75|41.5
 Awire|net@1568|||900|pin@658||-43|44|pin@688||-43|41.5
 Awire|net@1570|||0|pin@687||-30.75|41.5|pin@688||-43|41.5
-Awire|net@1572|||900|fireIvan@3|MSN[ZeroOrDone]|-28.75|48.5|pin@689||-28.75|33
+Awire|net@1572|||900|fireIvan@3|MSN[ZeroOrDone]|-28.75|45.5|pin@689||-28.75|33
 Awire|net@1573|||1800|pin@640||-46|33|pin@689||-28.75|33
-Awire|net@1575|||900|fireIvan@3|disableLO|-24|49|pin@691||-24|41.5
-Awire|net@1576|||0|inv@50|out|-21|41.5|pin@691||-24|41.5
-Awire|net@1577|||0|conn@8|y|-13.5|41.5|inv@50|in|-16|41.5
-Awire|net@1618|||1800|nor2n@0|inb|-59|47.5|pin@702||-58|47.5
-Awire|net@1624|||1800|pin@702||-58|47.5|pin@705||-46|47.5
-Awire|net@1625|||2700|pin@640||-46|33|pin@705||-46|47.5
-Awire|net@1626|||0|inv@62|out|-59|14.5|inv@63|in|-59|14.5
-Awire|net@1627|||0|inv@63|out|-64|14.5|inv@22|in|-64|14.5
-Awire|net@1628|||1800|inv@62|in|-54|14.5|pin@597||-43|14.5
-Awire|net@1629|||0|inv@64|out|-43.5|23|inv@65|in|-43.5|23
-Awire|net@1630|||0|inv@65|out|-48.5|23|inv@42|in|-49|23
-Awire|net@1631|||1800|inv@64|in|-38.5|23|pin@706||-36.5|23
-Awire|net@1632|||2700|pin@706||-36.5|23|pin@707||-36.5|27.5
-Awire|net@1633|||900|pin@688||-43|41.5|pin@708||-43|27.5
-Awire|net@1635|||0|pin@707||-36.5|27.5|pin@708||-43|27.5
+Awire|net@1575|||900|fireIvan@3|disableLO|-24|46|pin@691||-24|41.5
 Awire|net@1646|||900|pin@633||-46|66.5|pin@710||-46|62
-Awire|net@1647|||900|pin@710||-46|62|pin@705||-46|47.5
 Awire|net@1652|||0|predCond@4|cond|-12|62|pin@713||-23|62
 Awire|net@1653|||1800|pin@710||-46|62|pin@714||-33|62
 Awire|net@1654|||1800|pin@714||-33|62|pin@713||-23|62
 Awire|net@1657|||0|inv@37|in|-19.5|14.5|pin@716||-19.5|14.5
 Awire|net@1660|||900|pin@597||-43|14.5|pin@639||-43|9
 Awire|net@1661|||0|inv@37|in|-19.5|14.5|pin@597||-43|14.5
+Awire|net@1666|||0|pin@719||-43|23|pin@717||-48.5|23
+Awire|net@1668|||900|pin@688||-43|41.5|pin@719||-43|23
+Awire|net@1669|||0|sucDri20@1|succ|-77|49.5|pin@720||-82|49.5
+Awire|net@1670|||900|pin@631||-82|55|pin@720||-82|49.5
+Awire|net@1673|||1800|pin@691||-24|41.5|conn@8|y|-20|41.5
+Awire|net@1674|||0|pin@597||-43|14.5|pin@723||-54|14.5
+Awire|net@1675|||0|inv@22|in|-64|14.5|pin@724||-64|14.5
+Awire|net@1676|||0|pin@723||-54|14.5|inv@22|in|-64|14.5
+Awire|net@1677|||0|inv@38|in|-59|23|pin@725||-59|23
+Awire|net@1678|||0|pin@717||-48.5|23|pin@726||-49|23
+Awire|net@1679|||1800|inv@38|in|-59|23|pin@726||-49|23
+Awire|net@1685|||0|pin@667||-47.5|49.5|pin@728||-49|49.5
+Awire|net@1691|||1800|sucDri20@1|cond|-72|48.5|pin@729||-69|48.5
+Awire|net@1693|||1800|nand2@2|out|-69|48.5|pin@729||-69|48.5
+Awire|net@1695|||0|inv@49|out|-62.5|47.5|nand2@2|inb|-64|47.5
+Awire|net@1696|||0|inv@50|out|-56.5|49.5|nand2@2|ina|-64|49.5
+Awire|net@1697|||1800|inv@50|in|-51.5|49.5|pin@728||-49|49.5
+Awire|net@1698|||2700|pin@640||-46|33|pin@730||-46|47.5
+Awire|net@1699|||2700|pin@730||-46|47.5|pin@710||-46|62
+Awire|net@1700|||1800|inv@49|in|-57.5|47.5|pin@730||-46|47.5
 ELSN[ZeroOrDone]||D5G2;X12.5;|conn@0|a|B
 ELSN[ZeroOrTwo]||D5G2;X13.5;|conn@3|a|B
 EMSN[ZeroOrDone]||D5G2;X13;|conn@1|a|B
 EMSN[ZeroOrTwo]||D5G2;X-10.5;|conn@2|a|B
-Edisable||D5G2;X0.5;Y-2.5;|conn@8|a|I
+Edisable|disableLO|D5G2;X-5.5;|conn@8|a|I
 X
 
 # Cell predCond;2{ic}
@@ -919,15 +971,15 @@ Estate[1]|state|D5G2;X2.5;|pin@6||B
 X
 
 # Cell predCond;1{sch}
-CpredCond;1{sch}||schematic|1227920907034|1247964921320||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
+CpredCond;1{sch}||schematic|1227920907034|1248138341053||ATTR_X(D5G4;HNPX-23;Y28;)S@X
+IredFive:PMOS;1{ic}|PMOS@0||-7.5|7.5|||D5G4;|ATTR_X(D5G1.5;NOLPX-3;Y1.5;)S@X
+IredFive:PMOS;1{ic}|PMOS@1||-5.5|7.5|X||D5G4;|ATTR_X(D5G1.5;NOLPX-3;Y1.5;)S@X
 Ngeneric:Facet-Center|art@0||0|0||||AV
 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;NOLPX-2.25;)S@X
+IredFive:nms2b;1{ic}|nms2b@0||-6.5|-10|X||D5G4;|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|
@@ -943,7 +995,7 @@ NWire_Pin|pin@64||-1|7.5||||
 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;NOLPX4.25;Y3;)S2
+IredFive:pms1;2{ic}|pms1@1||-6.5|12|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-2.25;Y2.5;)S@X
 IpredCond;1{ic}|pred10wM@1||28.5|25|||D5G4;
 IpredCond;2{ic}|predCond@0||11.5|25|||D5G4;|ATTR_X(D5G1;NPX-0.25;Y-5.25;)S@X
 Awire|net@90|||0|pin@41||34|0.5|pin@36||-6.5|0.5
@@ -1189,10 +1241,10 @@ Esucc|state|D5G2;X4.5;|pin@2||B
 X
 
 # Cell succCond;1{sch}
-CsuccCond;1{sch}||schematic|1188777360591|1247965107296||ATTR_X(D5G1;HNPX-21;Y26;)I8
-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
+CsuccCond;1{sch}||schematic|1188777360591|1248138297399||ATTR_X(D5G1;HNPX-21;Y26;)I8
+IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@0||-3|-4|||D0G4;|ATTR_X(D5G1.5;NOLPX-0.5;Y3;)S@X
+IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@1||3|-4|X||D0G4;|ATTR_X(D5G1.5;NOLPX-1.5;Y2;)S@X
+IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@2||0|-12|X||D0G4;|ATTR_X(D5G1.5;NOLPX-2.5;Y-2;)S@X
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-17|0||||
 NOff-Page|conn@1||23.5|0||||
@@ -1213,7 +1265,7 @@ NWire_Pin|pin@60||0|-8||||
 NWire_Pin|pin@61||0|0||||
 NWire_Pin|pin@62||9|10||||
 NWire_Pin|pin@63||-9|6||||
-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;)S@X
+IredFive:pms2;1{ic}|pms2@0||0|10|X||D0G4;|ATTR_X(D5G1.5;NOLPX1.25;Y6;)S@X
 IsuccCond;1{ic}|sucDri20@2||36|16|||D5G4;
 IsuccCond;2{ic}|succCond@1||21|17|||D5G4;|ATTR_X(D5G1;NPX-0.5;Y5;)I8
 Awire|net@109|||2700|pin@39||-9|-4|pin@37||-9|0