still works

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index a2967aa..f115047 100644 (file)
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -163,17 +163,17 @@ Enot_fire[2]||D5G2;X-5.5;Y1.5;|pin@33||O
 X
 
 # Cell fire;1{sch}
-Cfire;1{sch}||schematic|1247526811643|1247721919781|
+Cfire;1{sch}||schematic|1247526811643|1247799741482|
 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:NMOS;1{ic}|NMOS@2||-14|-41.5|||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_X(D5G1.5;NPX5;Y0.5;)S8
+IredFive:NMOS;1{ic}|NMOS@5||-26|-26.5|||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_X(D5G1.5;NPX5;Y0.5;)S8
+IredFive:NMOS;1{ic}|NMOS@7||-14|-47.5|||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_X(D5G1.5;NPX5;Y0.5;)S8
 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
+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;)S500
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-50.5|-38||||
 NOff-Page|conn@1||22.5|-37|||RR|
@@ -454,7 +454,7 @@ Enot_load_zero||D5G2;X-5.5;Y-0.5;|pin@31||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1247771227756|
+ConeBit;1{sch}||schematic|1242942044308|1247800907912|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-1.5|19||||
 NOff-Page|conn@1||-84|21|||RR|
@@ -471,7 +471,13 @@ Ifire;1{ic}|fire@0||-28|36|||D5G4;
 IredFive:inv;1{ic}|inv@9||-60|2|R||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@11||-60|8.5|R||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@12||-60|15.5|R||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
-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:inv;1{ic}|inv@13||-50.5|11|XRR||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
+IredFive:inv;1{ic}|inv@14||-54|57.5|XRR||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
+IredFive:inv;1{ic}|inv@15||-18|43.5|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
+IredFive:inv;1{ic}|inv@16||-18.5|28|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
+IredFive:inv;1{ic}|inv@17||-46.5|61.5|XRR||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
+IredFive:nand2;1{ic}|nand2@0||-18|52.5|RR||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
+IredFive:nms1;2{ic}|nms1@0||-9.5|5|||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||-60|-5.5|R||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;
@@ -491,40 +497,34 @@ 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@337||-35.5|22||||
 NWire_Pin|pin@343||-26.5|20||||
-NWire_Pin|pin@344||-35.5|51.5||||
+NWire_Pin|pin@344||-35.5|49.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@371||-22.5|5||||
 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@380||-53|69.5||||
+NWire_Pin|pin@384||-58.5|74.5||||
+NWire_Pin|pin@385||-43.5|74.5||||
+NWire_Pin|pin@386||-43.5|70.5||||
 NWire_Pin|pin@395||-44|49||||
-NWire_Pin|pin@396||-46|49||||
-NWire_Pin|pin@397||-44|49.5||||
-NWire_Pin|pin@398||-26.5|57||||
+NWire_Pin|pin@397||-44|51.5||||
+NWire_Pin|pin@398||-26.5|68.5||||
 NWire_Pin|pin@401||-33|101.5||||
 NWire_Pin|pin@402||-29.5|104||||
 NWire_Pin|pin@418||-70.5|50.5||||
-NWire_Pin|pin@419||-70.5|71.5||||
+NWire_Pin|pin@419||-70.5|74.5||||
 NWire_Pin|pin@423||-43.5|68.5||||
 NWire_Pin|pin@435||-44|44.5||||
 NWire_Pin|pin@448||-70.5|21||||
@@ -534,93 +534,102 @@ 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||||
+NWire_Pin|pin@457||-41|20||||
 NWire_Pin|pin@463||-60|44.5||||
 NWire_Pin|pin@464||-61|-10.5||||
 NWire_Pin|pin@465||-64.5|-10.5||||
-NWire_Pin|pin@466||-64.5|71.5||||
+NWire_Pin|pin@466||-64.5|74.5||||
 NWire_Pin|pin@467||-59|-21.5||||
+NWire_Pin|pin@468||-55.5|21||||
+NWire_Pin|pin@469||-55.5|11||||
+NWire_Pin|pin@470||-44.5|11||||
+NWire_Pin|pin@471||-44.5|17.5||||
+NWire_Pin|pin@472||-44.5|35||||
+NWire_Pin|pin@473||-59|57.5||||
+NWire_Pin|pin@474||-59|50.5||||
+NWire_Pin|pin@475||-45.5|57.5||||
+NWire_Pin|pin@476||-45.5|54||||
+NWire_Pin|pin@477||-43|57.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@481||-22.5|41||||
+NWire_Pin|pin@482||-22.5|58.5||||
+NWire_Pin|pin@483||-22|28||||
+NWire_Pin|pin@484||-22|35||||
+NWire_Pin|pin@485||-22|22.5||||
+NWire_Pin|pin@486||-14|28||||
+NWire_Pin|pin@487||-53|61.5||||
+NWire_Pin|pin@488||-42.5|61.5||||
+NWire_Pin|pin@489||-42.5|66.5||||
+NWire_Pin|pin@490||-42.5|66||||
+NWire_Pin|pin@491||-14|53.5||||
+NWire_Pin|pin@492||-13|51.5||||
+NWire_Pin|pin@493||-13|19||||
 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
+IpredCondMSC;1{ic}|predCond@5||-48.5|69.5|RR||D5G4;
+IsuccCond;1{ic}|sucDri20@0||-48|21|YRR||D5G4;
+IsuccCond;1{ic}|sucDri20@1||-48|50.5|RR||D5G4;
+Awire|load_one|D5G2;||0|nms1@0|g|-12.5|5|pin@371||-22.5|5
 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@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
 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@719|||2700|fire@0|not_fire[2]|-35.5|48|pin@344||-35.5|49.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@787|||2700|nms1@0|d|-9.5|7|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@843|||900|sucDri20@1|cond|-46|49.5|pin@396||-46|49
-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|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@812|||0|predCond@5|state[1]|-51|69.5|pin@380||-53|69.5
+Awire|net@822|||900|pin@385||-43.5|74.5|pin@386||-43.5|70.5
+Awire|net@823|||0|pin@386||-43.5|70.5|predCond@5|cond|-46|70.5
+Awire|net@844|||2700|pin@395||-44|49|pin@397||-44|51.5
+Awire|net@845|||1800|sucDri20@1|cond|-46|51.5|pin@397||-44|51.5
+Awire|net@846|||2700|fire@0|fire|-26.5|48|pin@398||-26.5|68.5
+Awire|net@847|||900|pin@398||-26.5|68.5|pin@361||-26.5|61
+Awire|net@848|||1800|predCond@5|in[1]|-45.5|68.5|pin@398||-26.5|68.5
 Awire|net@854|||1800|conn@7|y|-34.5|101.5|pin@401||-33|101.5
 Awire|net@855|||900|pin@401||-33|101.5|pin@373||-33|71
 Awire|net@856|||1800|conn@6|y|-34.5|104|pin@402||-29.5|104
 Awire|net@857|||2700|pin@374||-29.5|74.5|pin@402||-29.5|104
-Awire|net@891|||0|pin@293||-53|50.5|pin@418||-70.5|50.5
 Awire|net@893|||900|delay@1|in|-70.5|52.5|pin@418||-70.5|50.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@895|||1800|pin@419||-70.5|74.5|pin@385||-43.5|74.5
+Awire|net@896|||2700|delay@1|out|-70.5|69.5|pin@419||-70.5|74.5
+Awire|net@905|||900|pin@385||-43.5|74.5|pin@423||-43.5|68.5
 Awire|net@924|||2700|pin@435||-44|44.5|pin@395||-44|49
-Awire|net@944|||0|pin@296||-53|21|pin@448||-70.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@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@954|||900|delay@5|in|-70.5|74.5|pin@419||-70.5|74.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|net@957|||900|pin@456||-41|96|pin@457||-41|20
+Awire|net@958|||0|pin@457||-41|20|sucDri20@0|cond|-46|20
 Awire|net@962|||1800|conn@1|a|-82|21|pin@448||-70.5|21
 Awire|net@963|||1800|conn@2|y|-81|50.5|pin@418||-70.5|50.5
 Awire|net@966|||900|inv@11|in|-60|6|inv@9|out|-60|4.5
@@ -630,12 +639,61 @@ Awire|net@969|||2700|inv@12|out|-60|18|pin@463||-60|44.5
 Awire|net@970|||1800|pin@463||-60|44.5|pin@435||-44|44.5
 Awire|net@971|||900|nor2n@0|inb|-61|-8|pin@464||-61|-10.5
 Awire|net@972|||0|pin@464||-61|-10.5|pin@465||-64.5|-10.5
-Awire|net@973|||0|pin@384||-58.5|71.5|pin@466||-64.5|71.5
-Awire|net@974|||0|pin@466||-64.5|71.5|pin@419||-70.5|71.5
-Awire|net@975|||2700|pin@465||-64.5|-10.5|pin@466||-64.5|71.5
+Awire|net@973|||0|pin@384||-58.5|74.5|pin@466||-64.5|74.5
+Awire|net@974|||0|pin@466||-64.5|74.5|pin@419||-70.5|74.5
+Awire|net@975|||2700|pin@465||-64.5|-10.5|pin@466||-64.5|74.5
 Awire|net@976|||1800|pin@449||-70.5|-21.5|pin@467||-59|-21.5
 Awire|net@977|||1800|pin@467||-59|-21.5|pin@450||-24.5|-21.5
 Awire|net@978|||900|nor2n@0|ina|-59|-8|pin@467||-59|-21.5
+Awire|net@979|||0|pin@296||-53|21|pin@468||-55.5|21
+Awire|net@980|||0|pin@468||-55.5|21|pin@448||-70.5|21
+Awire|net@981|||900|pin@468||-55.5|21|pin@469||-55.5|11
+Awire|net@982|||1800|pin@469||-55.5|11|inv@13|in|-53|11
+Awire|net@983|||1800|inv@13|out|-48|11|pin@470||-44.5|11
+Awire|net@984|||2700|pin@470||-44.5|11|pin@471||-44.5|17.5
+Awire|net@985|||0|pin@471||-44.5|17.5|sucDri20@0|not_succ|-49.25|17.5
+Awire|net@987|||1800|pin@472||-44.5|35|pin@376||-39|35
+Awire|net@988|||2700|pin@471||-44.5|17.5|pin@472||-44.5|35
+Awire|net@989|||0|inv@14|in|-56.5|57.5|pin@473||-59|57.5
+Awire|net@990|||0|pin@293||-53|50.5|pin@474||-59|50.5
+Awire|net@991|||0|pin@474||-59|50.5|pin@418||-70.5|50.5
+Awire|net@992|||900|pin@473||-59|57.5|pin@474||-59|50.5
+Awire|net@993|||1800|inv@14|out|-51.5|57.5|pin@475||-45.5|57.5
+Awire|net@994|||900|pin@475||-45.5|57.5|pin@476||-45.5|54
+Awire|net@995|||1800|sucDri20@1|not_succ|-49.25|54|pin@476||-45.5|54
+Awire|net@996|||1800|pin@475||-45.5|57.5|pin@477||-43|57.5
+Awire|net@998|||1800|pin@478||-43|37|fire@0|NotMSN[ZeroOrOne]|-39|37
+Awire|net@999|||900|pin@477||-43|57.5|pin@478||-43|37
+Awire|net@1000|||0|pin@344||-35.5|49.5|sucDri20@1|in|-46|49.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@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@1008|||2700|pin@480||-22.5|43.5|pin@482||-22.5|58.5
+Awire|net@1009|||0|predCond@4|not_state|-18.5|58.5|pin@482||-22.5|58.5
+Awire|net@1010|||0|inv@16|out|-21|28|pin@483||-22|28
+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.5
+Awire|net@1015|||0|predCond@3|not_state|-18.5|22.5|pin@485||-22|22.5
+Awire|net@1016|||2700|pin@308||-14|19|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@1019|||900|pin@380||-53|69.5|pin@487||-53|61.5
+Awire|net@1020|||900|pin@487||-53|61.5|pin@293||-53|50.5
+Awire|net@1021|||0|inv@17|in|-49|61.5|pin@487||-53|61.5
+Awire|net@1022|||1800|inv@17|out|-44|61.5|pin@488||-42.5|61.5
+Awire|net@1023|||2700|pin@488||-42.5|61.5|pin@489||-42.5|66.5
+Awire|net@1024|||900|pin@489||-42.5|66.5|pin@490||-42.5|66
+Awire|net@1025|||1800|predCond@5|not_state|-48|66|pin@490||-42.5|66
+Awire|net@1026|||2700|pin@479||-14|43.5|pin@491||-14|53.5
+Awire|net@1027|||2700|pin@491||-14|53.5|pin@312||-14|62
+Awire|net@1028|||1800|nand2@0|ina|-15.5|53.5|pin@491||-14|53.5
+Awire|net@1029|||1800|nand2@0|inb|-15.5|51.5|pin@492||-13|51.5
+Awire|net@1030|||1800|pin@308||-14|19|pin@493||-13|19
+Awire|net@1031|||1800|pin@493||-13|19|pin@369||-9.5|19
+Awire|net@1032|||900|pin@492||-13|51.5|pin@493||-13|19
 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
@@ -649,22 +707,16 @@ Eload_one|not_load_zero|D5G2;X-8;|conn@4|a|I
 X
 
 # Cell predCondMSC;1{ic}
-CpredCondMSC;1{ic}||artwork|1227921780535|1247595835099|E
+CpredCondMSC;1{ic}||artwork|1227921780535|1247800686457|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||
+NThick-Circle|art@8||0|3.5|1|1||
 Nschematic:Bus_Pin|pin@2||-3|1|-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||
 NPin|pin@14||1.5|3|1|1|RR|
-NPin|pin@15||-2|3|1|1||
-NPin|pin@16||-2|2|1|1||
-NPin|pin@17||1|2.125|1|1||
-NPin|pin@18||0|3|1|1|RR|
-NPin|pin@19||1|3.75|1|1|RR|
-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||
@@ -673,49 +725,50 @@ NPin|pin@30||-3|1|1|1||
 NPin|pin@34||-0.5|-2|1|1||
 Nschematic:Bus_Pin|pin@41||-2.5|-1||||
 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||||
+Nschematic:Wire_Pin|pin@47||-0.5|3.5||||
 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
+NPin|pin@50||1|4|1|1||
+NPin|pin@51||1.5|4|1|1||
+NPin|pin@52||1.5|5|1|1||
+NPin|pin@53||1|4.5|1|1||
+NPin|pin@54||2|5.5|1|1||
+NPin|pin@55||0.5|4|1|1||
+NPin|pin@56||0.5|3|1|1||
 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
 AThicker|net@10|||FS1800|pin@8||1|3|pin@14||1.5|3
-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@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@29|||FS1800|pin@15||-2|3|pin@44||-1|3
-AThicker|net@30|||FS900|pin@45||-1.5|4|pin@46||-1.5|3
 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
+AThicker|net@33|||FS2700|pin@8||1|3|pin@50||1|4
+AThicker|net@34|||FS1800|pin@50||1|4|pin@51||1.5|4
+AThicker|net@35|||FS2700|pin@51||1.5|4|pin@52||1.5|5
+AThicker|net@36|||FS450|pin@52||1.5|5|pin@53||1|4.5
+AThicker|net@37|||FS2250|pin@52||1.5|5|pin@54||2|5.5
+AThicker|net@38|||FS900|pin@55||0.5|4|pin@56||0.5|3
 Econd||D5G2;X-3;|pin@41||I
 Ein[1]|fire|D5G2;X-1.5;|pin@2||I
-Enot_state||D5G2;Y1;|pin@47||O
+Enot_state|not_keep_up|D5G2;X-7;Y0.5;|pin@47||I
 Estate[1]|state|D5G2;X2.5;|pin@6||B
 X
 
 # Cell predCondMSC;1{sch}
-CpredCondMSC;1{sch}||schematic|1227920907034|1247717673627|
+CpredCondMSC;1{sch}||schematic|1227920907034|1247800611710|
 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@2||42.75|0.5|||X|
 NOff-Page|conn@4||9.5|-10|||X|
-NOff-Page|conn@5||12.5|20||||
-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
+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
 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|
 NWire_Pin|pin@36||-6.5|0.5|||X|
-NWire_Pin|pin@37||21.5|12||||
 NWire_Pin|pin@38||21.5|0.5||||
 NWire_Pin|pin@41||34|0.5||||
 NWire_Pin|pin@42||-18|0.5||||
@@ -724,17 +777,13 @@ 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@71||8.5|20||||
-NWire_Pin|pin@72||8.5|12||||
 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|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@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
@@ -748,20 +797,17 @@ 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@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@174|||0|conn@5|a|10.5|20|pin@71||8.5|20
-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
 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
+Awire|net@189|||0|conn@5|y|10|12|pms1@1|g|-3.5|12
 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
+Enot_state|not_keep_up|D5G2;X-6.5;|conn@5|a|I
 Estate[1]|state|D4G2;|conn@2|a|B
 X
 
@@ -875,22 +921,15 @@ Estate||D4G2;|conn@2|a|B
 X
 
 # Cell succCond;1{ic}
-CsuccCond;1{ic}||artwork|1188825505548|1247535388874|EI
+CsuccCond;1{ic}||artwork|1188825505548|1247800144358|EI
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NThick-Circle|art@10||-1.5|1|1|1||
 NThick-Circle|art@11||0|0|4|4|RRR||ART_degrees()F[0.0,3.1415927]
 NThick-Circle|art@12||-1.5|-1|1|1||
-NThick-Circle|art@13||0|-3|1|1||
 Nschematic:Bus_Pin|pin@0||-2|1|-1|-1|Y|
 Nschematic:Bus_Pin|pin@2||2|0|-1|-1||
-NPin|pin@47||1.5|-3.75|1|1|RR|
-NPin|pin@50||-1|-3|1|1||
-NPin|pin@51||-1|-1.75|1|1||
-NPin|pin@52||1.5|-3.75|1|1||
 NPin|pin@64||2|0|1|1||
 NPin|pin@65||2|-3|1|1||
-NPin|pin@66||0.5|-3|1|1|RR|
-NPin|pin@67||1.5|-2.25|1|1|RR|
 NPin|pin@68||-1|-2|1|1||
 NPin|pin@69||-1|2|1|1||
 NPin|pin@71||0|2|1|1||
@@ -900,32 +939,41 @@ NPin|pin@74||-1|-1|1|1||
 NPin|pin@75||0|-2|1|1||
 NPin|pin@76||1.5|-3|1|1||
 Ngeneric:Invisible-Pin|pin@77||0.5|0|||||ART_message(D5G2;)S7T
-NPin|pin@78||-0.5|-3|1|1||
-NPin|pin@79||-0.75|-4|1|1||
-NPin|pin@80||-0.75|-3|1|1||
-Nschematic:Wire_Pin|pin@81||-0.75|-4||||
-AThicker|net@38|||FS1431|pin@66||0.5|-3|pin@52||1.5|-3.75
+NPin|pin@79||1.25|-4|1|1||
+NPin|pin@80||1.25|-3|1|1||
+Nschematic:Wire_Pin|pin@81||1.25|-3.5||||
+NPin|pin@82||1.5|-4|1|1||
+NPin|pin@83||2|-4|1|1||
+NPin|pin@84||2|-4.5|1|1||
+NPin|pin@85||1|-4.5|1|1||
+NPin|pin@86||3|-4.5|1|1||
+NPin|pin@87||2|-5|1|1||
+NPin|pin@88||1.5|-5|1|1||
+NPin|pin@89||2.5|-5|1|1||
 AThicker|net@48|||FS900|pin@64||2|0|pin@65||2|-3
-AThicker|net@51|||FS369|pin@67||1.5|-2.25|pin@66||0.5|-3
-AThicker|net@54|||FS2700|pin@50||-1|-3|pin@51||-1|-1.75
 AThicker|net@55|||FS2700|pin@74||-1|-1|pin@69||-1|2
 AThicker|net@58|||FS1800|pin@69||-1|2|pin@71||0|2
 AThicker|net@59|||FS1800|pin@68||-1|-2|pin@72||0|-2
 AThicker|net@60|||FS2700|pin@68||-1|-2|pin@74||-1|-1
 AThicker|net@61|||FS1350|pin@74||-1|-1|pin@75||0|-2
-AThicker|net@62|||FS900|pin@76||1.5|-3|pin@47||1.5|-3.75
-AThicker|net@63|||FS900|pin@67||1.5|-2.25|pin@76||1.5|-3
 AThicker|net@64|||FS0|pin@65||2|-3|pin@76||1.5|-3
-AThicker|net@65|||FS0|pin@78||-0.5|-3|pin@50||-1|-3
-AThicker|net@66|||FS2700|pin@79||-0.75|-4|pin@80||-0.75|-3
+AThicker|net@66|||FS2700|pin@79||1.25|-4|pin@80||1.25|-3
+ASolid|net@67|||FS900|pin@76||1.5|-3|pin@82||1.5|-4
+ASolid|net@68|||FS1800|pin@82||1.5|-4|pin@83||2|-4
+ASolid|net@69|||FS900|pin@83||2|-4|pin@84||2|-4.5
+ASolid|net@70|||FS0|pin@84||2|-4.5|pin@85||1|-4.5
+ASolid|net@71|||FS1800|pin@84||2|-4.5|pin@86||3|-4.5
+ASolid|net@72|||FS900|pin@84||2|-4.5|pin@87||2|-5
+ASolid|net@73|||FS0|pin@87||2|-5|pin@88||1.5|-5
+ASolid|net@74|||FS1800|pin@87||2|-5|pin@89||2.5|-5
 Econd||D5G2;X-2.5;|pin@73||I
 Ein||D5G2;X-1.5;|pin@0||I
-Enot_succ|not_state|D5G2;|pin@81||O
+Enot_succ|keep_down|D5G2;|pin@81||I
 Esucc|state|D5G2;X4.5;|pin@2||B
 X
 
 # Cell succCond;1{sch}
-CsuccCond;1{sch}||schematic|1188777360591|1247713530263|
+CsuccCond;1{sch}||schematic|1188777360591|1247800165370|
 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
@@ -933,14 +981,11 @@ 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||||
+NOff-Page|conn@3||17.5|-12|||RR|
 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;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||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||||
 NWire_Pin|pin@37||-9|0||||
 NWire_Pin|pin@39||-9|-4||||
 NWire_Pin|pin@54||-3|-8||||
@@ -952,16 +997,8 @@ NWire_Pin|pin@60||0|-8||||
 NWire_Pin|pin@61||0|0||||
 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;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
-Awire|net@95|||1800|inv@1|in|18.5|-12|pin@32||19.5|-12
-Awire|net@96|||1800|pin@33||19.5|0|conn@1|a|21.5|0
-Awire|net@97|||2700|pin@32||19.5|-12|pin@33||19.5|0
-Awire|net@98|||0|pin@33||19.5|0|pin@56||3|0
 Awire|net@109|||2700|pin@39||-9|-4|pin@37||-9|0
 Awire|net@111|||2700|pin@37||-9|0|pin@63||-9|6
 Awire|net@122|||0|pin@37||-9|0|conn@0|y|-15|0
@@ -983,12 +1020,10 @@ Awire|net@176|||2700|gnd@0||0|-16.5|NMOSx@2|s|0|-14
 Awire|net@177|||1800|pms2@0|g|3|10|pin@62||9|10
 Awire|net@178|||900|pin@62||9|10|pin@57||9|6
 Awire|net@180|||0|pms2@0|g2|-3|6|pin@63||-9|6
-Awire|net@181|||0|conn@3|a|21|-16.5|pin@64||4|-16.5
-Awire|net@182|||0|wire90@0|a|6|-12|pin@65||4|-12
-Awire|net@183|||0|pin@65||4|-12|NMOSx@2|g|3|-12
-Awire|net@184|||2700|pin@64||4|-16.5|pin@65||4|-12
+Awire|net@187|||0|conn@1|a|21.5|0|pin@56||3|0
+Awire|net@188|||0|conn@3|y|15.5|-12|NMOSx@2|g|3|-12
 Econd||D4G2;|conn@2|a|I
 Ein||D4G2;|conn@0|a|I
-Enot_succ|not_state|D5G2;X8.5;|conn@3|a|O
+Enot_succ|keep_down|D5G2;X-6.5;|conn@3|a|I
 Esucc|state|D6G2;|conn@1|y|B
 X