works

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index 2f00de6..acd0915 100644 (file)
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -626,7 +626,7 @@ Edisable|disableLO|D5G2;X-2;Y-2;|pin@38||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1248152204370|
+ConeBit;1{sch}||schematic|1242942044308|1248152982069|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||1.5|16.5||||
 NOff-Page|conn@1||-87.5|19.5|||RR|
@@ -634,14 +634,14 @@ NOff-Page|conn@2||-87.5|55||||
 NOff-Page|conn@3||2|61||||
 NOff-Page|conn@9||16.5|49.5|||RR|
 Ifire;3{ic}|fireIvan@3||-28|48|||D5G4;|ATTR_X(D5G2;NOLPX6.25;Y2;)S8
-IredFive:inv;1{ic}|inv@39||-50|20.5|X||D0G4;|ATTR_X(D5G1.5;NPX-3.5;Y-1.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@49||-49.5|49.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.5;Y-3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@50||-43|47.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@39||-53|66|X||D0G4;|ATTR_X(D5G1.5;NPX0.5;Y-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@49||-43|47.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.5;Y-3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@50||-43|66|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@51||11|56|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@52||-10|43|X||D0G4;|ATTR_X(D5G1.5;NPX-3.5;Y-1.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@53||-10|50.5|X||D0G4;|ATTR_X(D5G1.5;NPX-3.5;Y-1.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:invLT;1{ic}|invLT@0||-32.5|61.5|R||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.5;Y3;)S8|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:nand2;1{ic}|nand2@2||-58.5|48.5|YRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.5;Y3.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nand2;1{ic}|nand2@2||-53|48.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.5;Y3.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@3||-16.5|20.5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.5;Y3.5;)S2|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
@@ -683,16 +683,16 @@ NWire_Pin|pin@691||-24|41.5||||
 NWire_Pin|pin@720||-82|49.5||||
 NWire_Pin|pin@724||-64|14.5||||
 NWire_Pin|pin@729||-69|48.5||||
-NWire_Pin|pin@730||-40|49.5||||
+NWire_Pin|pin@730||-40|47.5||||
 NWire_Pin|pin@731||-64|62||||
-NWire_Pin|pin@737||-46.5|47.5||||
-NWire_Pin|pin@738||-38|47.5||||
+NWire_Pin|pin@737||-49|49.5||||
+NWire_Pin|pin@738||-38|66||||
 NWire_Pin|pin@739||-64|67||||
-NWire_Pin|pin@741||-53.5|49.5||||
-NWire_Pin|pin@743||-46.5|20.5||||
+NWire_Pin|pin@741||-47|47.5||||
+NWire_Pin|pin@743||-49|66||||
 NWire_Pin|pin@747||-64|14.5||||
 NWire_Pin|pin@753||-64|62||||
-NWire_Pin|pin@754||-55|66||||
+NWire_Pin|pin@754||-57|66||||
 NWire_Pin|pin@759||-63|18.5||||
 NWire_Pin|pin@763||-27.5|17.5||||
 NWire_Pin|pin@764||-32.5|57||||
@@ -705,20 +705,16 @@ NWire_Pin|pin@776||-30.5|19.5||||
 NWire_Pin|pin@784||-16|41.5||||
 NWire_Pin|pin@786||4|56||||
 NWire_Pin|pin@789||25.5|56||||
-NWire_Pin|pin@792||-41.5|15.5||||
-NWire_Pin|pin@793||-41.5|36||||
-NWire_Pin|pin@794||-53.5|36||||
-NWire_Pin|pin@798||-55|20.5||||
+NWire_Pin|pin@798||-57|20.5||||
 NWire_Pin|pin@799||4|49.5||||
 NWire_Pin|pin@802||-64|67||||
 NWire_Pin|pin@805||-51.5|73||||
 NWire_Pin|pin@806||-59.5|64||||
-NWire_Pin|pin@807||-46.5|69||||
-NWire_Pin|pin@809||-40|71||||
+NWire_Pin|pin@807||-49|69||||
 NWire_Pin|pin@810||-82|65||||
-NWire_Pin|pin@814||-46.5|45.5||||
-NWire_Pin|pin@815||-58|43.5||||
-NWire_Pin|pin@816||-53.5|15||||
+NWire_Pin|pin@814||-49|45.5||||
+NWire_Pin|pin@815||-61|43.5||||
+NWire_Pin|pin@816||-47|15||||
 NWire_Pin|pin@817||-73.5|15||||
 NWire_Pin|pin@818||-53.5|13.5||||
 NWire_Pin|pin@819||-22|62||||
@@ -730,22 +726,25 @@ NWire_Pin|pin@825||-5|50.5||||
 NWire_Pin|pin@826||-17.5|50.5||||
 NWire_Pin|pin@827||-17.5|67||||
 NWire_Pin|pin@832||-5|61||||
+NWire_Pin|pin@833||-12|15||||
+NWire_Pin|pin@834||-79.5|71||||
+NWire_Pin|pin@835||-79.5|30||||
 IpredCond;2{ic}|predCond@10||-9|16.5|||D5G4;|ATTR_X(D5G2;NPX0.25;Y-5.25;)S8
-IpredCond3;1{ic}|predCond@12||-75|65|X||D5G4;|ATTR_X(D5G2;NOLPY-7.5;)S8
-IpredCond3;2{ic}|predCond@15||-9|61|||D5G4;|ATTR_X(D5G1;NOLPY-6;)S@X
-IsuccCond2;1{ic}|sucDri20@1||-75|49.5|YRR||D5G4;|ATTR_X(D5G2;NOLPX0.5;Y5;)S8
+IpredCond3;1{ic}|predCond@16||-9|61|||D5G4;|ATTR_X(D5G2;NOLPY-7.5;)S8
+IpredCond3;2{ic}|predCond@17||-75|65|X||D5G4;|ATTR_X(D5G2;NOLPY-7.5;)S8
+IsuccCond2;1{ic}|sucDri20@1||-75|49.5|YRR||D5G4;|ATTR_X(D5G2;NOLPX0.5;Y7;)S8
 IsuccCond2;2{ic}|succCond@0||-74.5|19.5|YRR||D5G4;|ATTR_X(D5G2;NOLPY5.5;)S8
 Awire|disable|D5G2;||1800|inv@51|out|13.5|56|pin@789||25.5|56
-Awire|disable|D5G2;||1800|predCond@12|not_keep_up[3]|-72|73|pin@805||-51.5|73
-Awire|disable|D5G2;||0|predCond@15|not_keep_up[3]|-12|69|pin@821||-24.5|69
+Awire|disable|D5G2;||0|predCond@16|not_keep_up[3]|-12|69|pin@821||-24.5|69
+Awire|disable|D5G2;||1800|predCond@17|not_keep_up[3]|-72|73|pin@805||-51.5|73
 Awire|disableLO|D5G2;||0|nand2@3|ina|-19|19.5|pin@776||-30.5|19.5
 Awire|disableLO|D5G2;||1800|pin@691||-24|41.5|pin@784||-16|41.5
-Awire|disableLO|D5G2;||1800|sucDri20@1|keep_down[2]|-74|43.5|pin@815||-58|43.5
+Awire|disableLO|D5G2;||1800|sucDri20@1|keep_down[2]|-74|43.5|pin@815||-61|43.5
 Awire|disableLO|D5G2;||1800|succCond@0|keep_down[2]|-73.5|13.5|pin@818||-53.5|13.5
 Awire|fire|D5G2;||0|predCond@10|fire|-12|17.5|pin@763||-27.5|17.5
 Awire|fire|D5G2;||2700|pin@765||-27.75|57|pin@575||-27.75|67.5
-Awire|fire|D5G2;||1800|predCond@12|fire|-72|64|pin@806||-59.5|64
-Awire|fire|D5G2;||0|predCond@15|fire|-12|62|pin@819||-22|62
+Awire|fire|D5G2;||0|predCond@16|cond|-12|62|pin@819||-22|62
+Awire|fire|D5G2;||1800|predCond@17|cond|-72|64|pin@806||-59.5|64
 Awire|fireLO|D5G2;||0|pin@669||-62.5|50.5|pin@608||-72|50.5
 Awire|fireLO|D5G2;||1800|succCond@0|in|-71.5|18.5|pin@759||-63|18.5
 Awire|fireLO|D5G2;||2700|invLT@0|out|-32.5|64|pin@766||-32.5|69.5
@@ -775,16 +774,15 @@ Awire|net@1575|||900|fireIvan@3|disableLO|-24|46|pin@691||-24|41.5
 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@1691|||1800|sucDri20@1|cond|-72|48.5|pin@729||-69|48.5
-Awire|net@1693|||0|nand2@2|out|-61|48.5|pin@729||-69|48.5
-Awire|net@1698|||2700|pin@640||-40|30|pin@730||-40|49.5
-Awire|net@1700|||1800|inv@49|in|-47|49.5|pin@730||-40|49.5
-Awire|net@1710|||0|inv@50|out|-45.5|47.5|pin@737||-46.5|47.5
-Awire|net@1716|||1800|inv@50|in|-40.5|47.5|pin@738||-38|47.5
-Awire|net@1719|||0|inv@49|out|-52|49.5|pin@741||-53.5|49.5
-Awire|net@1720|||0|pin@741||-53.5|49.5|nand2@2|inb|-56|49.5
+Awire|net@1693|||0|nand2@2|out|-55.5|48.5|pin@729||-69|48.5
+Awire|net@1698|||2700|pin@640||-40|30|pin@730||-40|47.5
+Awire|net@1700|||1800|inv@49|in|-40.5|47.5|pin@730||-40|47.5
+Awire|net@1716|||1800|inv@50|in|-40.5|66|pin@738||-38|66
+Awire|net@1719|||0|inv@49|out|-45.5|47.5|pin@741||-47|47.5
+Awire|net@1720|||0|pin@741||-47|47.5|nand2@2|inb|-50.5|47.5
 Awire|net@1729|||0|pin@724||-64|14.5|pin@747||-64|14.5
 Awire|net@1739|||0|pin@731||-64|62|pin@753||-64|62
-Awire|net@1744|||1800|inv@39|in|-47.5|20.5|pin@743||-46.5|20.5
+Awire|net@1744|||1800|inv@39|in|-50.5|66|pin@743||-49|66
 Awire|net@1762|||900|invLT@0|in|-32.5|59|pin@764||-32.5|57
 Awire|net@1763|||2700|fireIvan@3|fireHI|-27.75|54|pin@765||-27.75|57
 Awire|net@1764|||1800|pin@764||-32.5|57|pin@765||-27.75|57
@@ -794,48 +792,48 @@ Awire|net@1791|||0|predCond@10|not_keep_up|-11.5|20.5|nand2@3|out|-14|20.5
 Awire|net@1793|||2700|pin@775||-22.5|21.5|pin@663||-22.5|33
 Awire|net@1794|||0|nand2@3|inb|-19|21.5|pin@775||-22.5|21.5
 Awire|net@1811|||0|inv@51|in|8.5|56|pin@786||4|56
-Awire|net@1826|||0|predCond@10|cond|-12|15.5|pin@792||-41.5|15.5
-Awire|net@1828|||0|pin@793||-41.5|36|pin@794||-53.5|36
-Awire|net@1829|||900|pin@741||-53.5|49.5|pin@794||-53.5|36
-Awire|net@1833|||2700|pin@792||-41.5|15.5|pin@793||-41.5|36
-Awire|net@1838|||1800|nand2@2|ina|-56|47.5|pin@737||-46.5|47.5
-Awire|net@1839|||0|inv@39|out|-52.5|20.5|pin@798||-55|20.5
-Awire|net@1840|||0|pin@798||-55|20.5|succCond@0|cond|-71.5|20.5
-Awire|net@1841|||900|pin@754||-55|66|pin@798||-55|20.5
+Awire|net@1838|||1800|nand2@2|ina|-50.5|49.5|pin@737||-49|49.5
+Awire|net@1840|||0|pin@798||-57|20.5|succCond@0|cond|-71.5|20.5
+Awire|net@1841|||900|pin@754||-57|66|pin@798||-57|20.5
 Awire|net@1842|||900|pin@786||4|56|pin@799||4|49.5
 Awire|net@1843|||0|conn@9|y|14.5|49.5|pin@799||4|49.5
 Awire|net@1846|||0|pin@739||-64|67|pin@802||-64|67
-Awire|net@1852|||0|pin@754||-55|66|predCond@12|cond|-72|66
-Awire|net@1854|||900|pin@637||-38|69|pin@738||-38|47.5
-Awire|net@1855|||2700|pin@737||-46.5|47.5|pin@807||-46.5|69
-Awire|net@1859|||0|pin@807||-46.5|69|predCond@12|not_keep_up[1]|-72|69
-Awire|net@1861|||1800|predCond@12|not_keep_up[2]|-72|71|pin@809||-40|71
-Awire|net@1862|||2700|pin@730||-40|49.5|pin@809||-40|71
+Awire|net@1852|||0|pin@754||-57|66|predCond@17|fire|-72|66
+Awire|net@1854|||900|pin@637||-38|69|pin@738||-38|66
+Awire|net@1855|||2700|pin@737||-49|49.5|pin@807||-49|69
 Awire|net@1863|||900|pin@630||-82|77|pin@810||-82|65
 Awire|net@1864|||900|pin@810||-82|65|pin@631||-82|55
-Awire|net@1865|||0|predCond@12|state|-77.5|65|pin@810||-82|65
-Awire|net@1869|||2700|pin@688||-38|35|pin@738||-38|47.5
-Awire|net@1870|||900|pin@737||-46.5|47.5|pin@814||-46.5|45.5
-Awire|net@1871|||900|pin@814||-46.5|45.5|pin@743||-46.5|20.5
-Awire|net@1872|||1800|sucDri20@1|not_succ|-74|45.5|pin@814||-46.5|45.5
-Awire|net@1876|||0|pin@640||-40|30|pin@659||-82|30
-Awire|net@1877|||900|pin@794||-53.5|36|pin@816||-53.5|15
-Awire|net@1878|||0|pin@816||-53.5|15|pin@817||-73.5|15
+Awire|net@1865|||0|predCond@17|state|-77.5|65|pin@810||-82|65
+Awire|net@1869|||2700|pin@688||-38|35|pin@738||-38|66
+Awire|net@1870|||900|pin@737||-49|49.5|pin@814||-49|45.5
+Awire|net@1871|||2700|pin@814||-49|45.5|pin@743||-49|66
+Awire|net@1872|||1800|sucDri20@1|not_succ|-74|45.5|pin@814||-49|45.5
+Awire|net@1878|||0|pin@816||-47|15|pin@817||-73.5|15
 Awire|net@1879|||900|succCond@0|keep_down|-73.5|15.5|pin@817||-73.5|15
-Awire|net@1882|||0|predCond@15|cond|-12|60|pin@770||-15.5|60
+Awire|net@1882|||0|predCond@16|fire|-12|60|pin@770||-15.5|60
 Awire|net@1895|||900|pin@822||-2.5|43|pin@632||-2.5|33
 Awire|net@1896|||1800|inv@52|in|-7.5|43|pin@822||-2.5|43
 Awire|net@1897|||0|inv@52|out|-12.5|43|pin@823||-14|43
 Awire|net@1898|||2700|pin@823||-14|43|pin@824||-14|65
-Awire|net@1899|||1800|pin@824||-14|65|predCond@15|not_keep_up[1]|-12|65
+Awire|net@1899|||1800|pin@824||-14|65|predCond@16|not_keep_up[1]|-12|65
 Awire|net@1900|||2700|pin@479||-5|35|pin@825||-5|50.5
 Awire|net@1902|||1800|inv@53|in|-7.5|50.5|pin@825||-5|50.5
 Awire|net@1903|||0|inv@53|out|-12.5|50.5|pin@826||-17.5|50.5
 Awire|net@1904|||2700|pin@826||-17.5|50.5|pin@827||-17.5|67
-Awire|net@1905|||1800|pin@827||-17.5|67|predCond@15|not_keep_up[2]|-12|67
+Awire|net@1905|||1800|pin@827||-17.5|67|predCond@16|not_keep_up[2]|-12|67
 Awire|net@1910|||0|conn@3|a|0|61|pin@832||-5|61
-Awire|net@1911|||0|pin@832||-5|61|predCond@15|state|-6.5|61
+Awire|net@1911|||0|pin@832||-5|61|predCond@16|state|-6.5|61
 Awire|net@1912|||2700|pin@825||-5|50.5|pin@832||-5|61
+Awire|net@1913|||0|inv@39|out|-55.5|66|pin@754||-57|66
+Awire|net@1914|||0|inv@50|out|-45.5|66|pin@743||-49|66
+Awire|net@1915|||900|pin@741||-47|47.5|pin@816||-47|15
+Awire|net@1916|||900|predCond@10|cond|-12|15.5|pin@833||-12|15
+Awire|net@1917|||1800|pin@816||-47|15|pin@833||-12|15
+Awire|net@1930|||0|predCond@17|not_keep_up[2]|-76|71|pin@834||-79.5|71
+Awire|net@1931|||0|pin@640||-40|30|pin@835||-79.5|30
+Awire|net@1932|||0|pin@835||-79.5|30|pin@659||-82|30
+Awire|net@1933|||900|pin@834||-79.5|71|pin@835||-79.5|30
+Awire|net@1934|||0|pin@807||-49|69|predCond@17|not_keep_up[1]|-72|69
 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
@@ -1189,14 +1187,93 @@ Enot_keep_up[2]||D5G2;X-8;|conn@6|a|I
 Estate||D4G2;|conn@2|a|B
 X
 
+# Cell predCond3;3{ic}
+CpredCond3;3{ic}||artwork|1227921780535|1248151211226|E|ATTR_X(D5G1;HNOLPX-0.5;Y-3;)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]
+NThick-Circle|art@9||-2.5|4|1|1||
+NThick-Circle|art@10||-2.5|6|1|1||
+NThick-Circle|art@11||-2.5|8|1|1||
+Nschematic:Bus_Pin|pin@2||-3|-1|-1|-1||
+Nschematic:Bus_Pin|pin@6||2.5|0|-1|-1||
+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@29||-2.5|1|1|1||
+NPin|pin@30||-3|1|1|1||
+NPin|pin@34||-0.5|-2|1|1||
+Nschematic:Bus_Pin|pin@41||-3|1||||
+Nschematic:Wire_Pin|pin@47||-3|4||||
+NPin|pin@48||-1.5|2|1|1||
+NPin|pin@49||-2.5|1|1|1||
+NPin|pin@57||-2.5|-1|1|1||
+NPin|pin@58||-3|-1|1|1||
+Nschematic:Bus_Pin|pin@59||-3|6||||
+NPin|pin@77||-1|3.5|1|1|RR|
+NPin|pin@79||-1.5|4.5|1|1||
+NPin|pin@80||-1|4.5|1|1||
+NPin|pin@81||-1.5|9|1|1||
+NPin|pin@82||-0.5|10|1|1||
+NPin|pin@83||-2|4.5|1|1||
+NPin|pin@84||-2|3.5|1|1||
+NPin|pin@85||-1|5.5|1|1|RR|
+NPin|pin@86||-1.5|6.5|1|1||
+NPin|pin@87||-1|6.5|1|1||
+NPin|pin@88||-2|6.5|1|1||
+NPin|pin@89||-2|5.5|1|1||
+NPin|pin@90||-1.5|5.5|1|1|RR|
+NPin|pin@93||-1.5|3.5|1|1|RR|
+NPin|pin@94||-1|2|1|1||
+NPin|pin@95||-1|7.5|1|1|RR|
+NPin|pin@96||-1.5|8.5|1|1||
+NPin|pin@97||-1|8.5|1|1||
+NPin|pin@98||-2|8.5|1|1||
+NPin|pin@99||-2|7.5|1|1||
+NPin|pin@100||-1.5|7.5|1|1|RR|
+NPin|pin@101||-1|9.5|1|1||
+Nschematic:Wire_Pin|pin@102||-3|8||||
+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@26|||FS900|pin@29||-2.5|1|pin@27||-2.5|-2
+AThicker|net@31|||FS1800|pin@27||-2.5|-2|pin@34||-0.5|-2
+AThicker|net@32|||FS450|pin@48||-1.5|2|pin@49||-2.5|1
+AThicker|net@39|||FS0|pin@57||-2.5|-1|pin@58||-3|-1
+AThicker|net@53|||FS1800|pin@93||-1.5|3.5|pin@77||-1|3.5
+AThicker|net@54|||FS2700|pin@93||-1.5|3.5|pin@79||-1.5|4.5
+AThicker|net@55|||FS1800|pin@79||-1.5|4.5|pin@80||-1|4.5
+AThicker|net@56|||FS900|pin@83||-2|4.5|pin@84||-2|3.5
+AThicker|net@57|||FS2250|pin@81||-1.5|9|pin@82||-0.5|10
+AThicker|net@58|||FS1800|pin@90||-1.5|5.5|pin@85||-1|5.5
+AThicker|net@59|||FS2700|pin@90||-1.5|5.5|pin@86||-1.5|6.5
+AThicker|net@60|||FS1800|pin@86||-1.5|6.5|pin@87||-1|6.5
+AThicker|net@61|||FS900|pin@88||-2|6.5|pin@89||-2|5.5
+AThicker|net@62|||FS900|pin@85||-1|5.5|pin@80||-1|4.5
+AThicker|net@64|||FS1800|pin@25||-2.5|2|pin@94||-1|2
+AThicker|net@65|||FS1800|pin@94||-1|2|pin@26||-0.5|2
+AThicker|net@66|||FS900|pin@77||-1|3.5|pin@94||-1|2
+AThicker|net@67|||FS1800|pin@100||-1.5|7.5|pin@95||-1|7.5
+AThicker|net@68|||FS2700|pin@100||-1.5|7.5|pin@96||-1.5|8.5
+AThicker|net@69|||FS1800|pin@96||-1.5|8.5|pin@97||-1|8.5
+AThicker|net@70|||FS900|pin@98||-2|8.5|pin@99||-2|7.5
+AThicker|net@71|||FS2700|pin@87||-1|6.5|pin@95||-1|7.5
+AThicker|net@72|||FS2700|pin@97||-1|8.5|pin@101||-1|9.5
+Econd||D5G2;X-3;|pin@41||I
+Efire||D5G2;X-2.5;|pin@2||I
+Enot_keep_up[1]||D5G2;X-8;|pin@47||I
+Enot_keep_up[2]||D5G2;X-8;|pin@59||I
+Enot_keep_up[3]||D5G2;X-8;|pin@102||I
+Estate||D5G2;X2.5;|pin@6||B
+X
+
 # Cell predCond3;2{ic}
-CpredCond3;2{ic}||artwork|1227921780535|1248151166373|E|ATTR_X(D5G1;HNOLPX-0.5;Y-3;)S@X
+CpredCond3;2{ic}||artwork|1227921780535|1248152747175|E|ATTR_X(D5G1;HNOLPX-0.5;Y-3;)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]
 NThick-Circle|art@8||-2.5|4|1|1||
-NThick-Circle|art@9||-2.5|6|1|1||
 NThick-Circle|art@10||-2.5|8|1|1||
+NThick-Circle|art@11||0.5|6|1|1|RR|
 Nschematic:Bus_Pin|pin@2||-3|1|-1|-1||
 Nschematic:Bus_Pin|pin@6||2.5|0|-1|-1||
 NPin|pin@8||-1.5|3.5|1|1|RR|
@@ -1221,12 +1298,8 @@ NPin|pin@56||-2|3.5|1|1||
 NPin|pin@57||-2.5|-1|1|1||
 NPin|pin@58||-3|-1|1|1||
 NPin|pin@59||-1|5.5|1|1|RR|
-NPin|pin@60||-1.5|6.5|1|1||
 NPin|pin@61||-1|6.5|1|1||
-NPin|pin@62||-2|6.5|1|1||
-NPin|pin@63||-2|5.5|1|1||
-NPin|pin@64||-1.5|5.5|1|1|RR|
-Nschematic:Wire_Pin|pin@66||-3|6||||
+Nschematic:Wire_Pin|pin@66||1|6||||
 Nschematic:Bus_Pin|pin@67||-3|8||||
 NPin|pin@69||-1|7.5|1|1|RR|
 NPin|pin@70||-1.5|8.5|1|1||
@@ -1235,6 +1308,12 @@ NPin|pin@72||-2|8.5|1|1||
 NPin|pin@73||-2|7.5|1|1||
 NPin|pin@74||-1.5|7.5|1|1|RR|
 NPin|pin@76||-1|9.5|1|1||
+NPin|pin@77||-1|6.5|1|1||
+NPin|pin@78||-0.5|5.5|1|1|RR|
+NPin|pin@79||-1|5.5|1|1|RR|
+NPin|pin@80||0|5.5|1|1|RR|
+NPin|pin@81||0|6.5|1|1|RR|
+NPin|pin@82||-0.5|6.5|1|1||
 AThicker|net@5|||FS900|pin@14||-1|3.5|pin@9||-1|2
 AThicker|net@10|||FS1800|pin@8||-1.5|3.5|pin@14||-1|3.5
 AThicker|net@16|||FS1800|pin@25||-2.5|2|pin@26||-0.5|2
@@ -1248,10 +1327,6 @@ AThicker|net@34|||FS1800|pin@50||-1.5|4.5|pin@51||-1|4.5
 AThicker|net@38|||FS900|pin@55||-2|4.5|pin@56||-2|3.5
 AThicker|net@39|||FS0|pin@57||-2.5|-1|pin@58||-3|-1
 AThicker|net@40|||FS2250|pin@53||-1.5|9|pin@54||-0.5|10
-AThicker|net@41|||FS1800|pin@64||-1.5|5.5|pin@59||-1|5.5
-AThicker|net@42|||FS2700|pin@64||-1.5|5.5|pin@60||-1.5|6.5
-AThicker|net@43|||FS1800|pin@60||-1.5|6.5|pin@61||-1|6.5
-AThicker|net@44|||FS900|pin@62||-2|6.5|pin@63||-2|5.5
 AThicker|net@45|||FS900|pin@59||-1|5.5|pin@51||-1|4.5
 AThicker|net@48|||FS1800|pin@74||-1.5|7.5|pin@69||-1|7.5
 AThicker|net@49|||FS2700|pin@74||-1.5|7.5|pin@70||-1.5|8.5
@@ -1259,10 +1334,14 @@ AThicker|net@50|||FS1800|pin@70||-1.5|8.5|pin@71||-1|8.5
 AThicker|net@51|||FS900|pin@72||-2|8.5|pin@73||-2|7.5
 AThicker|net@52|||FS900|pin@69||-1|7.5|pin@61||-1|6.5
 AThicker|net@53|||FS2700|pin@71||-1|8.5|pin@76||-1|9.5
+AThicker|net@54|||FS0|pin@82||-0.5|6.5|pin@77||-1|6.5
+AThicker|net@55|||FS900|pin@82||-0.5|6.5|pin@78||-0.5|5.5
+AThicker|net@56|||FS0|pin@78||-0.5|5.5|pin@79||-1|5.5
+AThicker|net@57|||FS2700|pin@80||0|5.5|pin@81||0|6.5
 Econd||D5G2;X-2.5;|pin@41||I
 Efire||D5G2;X-2;|pin@2||I
 Enot_keep_up[1]||D5G2;X-8;|pin@47||I
-Enot_keep_up[2]||D5G2;X-8;|pin@66||I
+Enot_keep_up[2]||D5G2;X9;|pin@66||I
 Enot_keep_up[3]||D5G2;X-8;|pin@67||I
 Estate||D5G2;X2.5;|pin@6||B
 X
@@ -1347,7 +1426,7 @@ Estate||D5G2;X2.5;|pin@6||B
 X
 
 # Cell predCond3;1{sch}
-CpredCond3;1{sch}||schematic|1227920907034|1248151227455||ATTR_X(D5G4;HNOLPX-23;Y28;)S@X
+CpredCond3;1{sch}||schematic|1227920907034|1248152759654||ATTR_X(D5G4;HNOLPX-23;Y28;)S@X
 IredFive:PMOS;1{ic}|PMOS@0||-7.5|7.5|||D5G4;|ATTR_X(D5G1.5;NOLPX-3;Y1.5;)S1
 IredFive:PMOS;1{ic}|PMOS@1||-5.5|7.5|X||D5G4;|ATTR_X(D5G1.5;NOLPX-3;Y1.5;)S1
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -1376,6 +1455,7 @@ NWire_Pin|pin@78||9.5|13.5||||
 IredFive:pms3a;1{ic}|pms3a@1||-6.5|21.5|X||D5G4;|ATTR_Delay(D5G1;NPX-12;Y12;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX-3.75;Y3;)S1
 IpredCond3;1{ic}|predCond@3||32.5|25|||D5G4;
 IpredCond3;2{ic}|predCond@4||11.5|25|||D5G4;|ATTR_X(D5G1;NPX-0.25;Y-5.25;)S@X
+IpredCond3;2{ic}|predCond@6||47.5|23|||D5G4;|ATTR_X(D5G1;NOLPY-7;)S@X
 Awire|net@90|||0|pin@41||34|0.5|pin@36||-6.5|0.5
 Awire|net@92|||0|conn@2|y|40.75|0.5|pin@38||21.5|0.5
 Awire|net@100|||1800|pin@38||21.5|0.5|pin@41||34|0.5