From d9ba5409a20ffde260d6d6604872f40c7e92a5c6 Mon Sep 17 00:00:00 2001
From: Adam Megacz <adam@megacz.com>
Date: Wed, 23 Sep 2009 17:40:55 -0700
Subject: [PATCH] Calibre clean

---
 .../omegaCounter/40nm/electric/omegaCounter.jelib  |  541 ++++++++++----------
 1 file changed, 277 insertions(+), 264 deletions(-)

diff --git a/chips/omegaCounter/40nm/electric/omegaCounter.jelib b/chips/omegaCounter/40nm/electric/omegaCounter.jelib
index e1daf75..eb51ead 100644
--- a/chips/omegaCounter/40nm/electric/omegaCounter.jelib
+++ b/chips/omegaCounter/40nm/electric/omegaCounter.jelib
@@ -16,13 +16,56 @@ LpurpleFive|purpleFive
 LredFive|redFive
 
 # Tools:
-Ouser|DefaultTechnology()Scmos90|SchematicTechnology()Scmos90
+Ouser|DefaultTechnology()StsmcSun40GP|SchematicTechnology()StsmcSun40GP
 Oio|GDSOutputConvertsBracketsInExports()BF|GDSWritesExportPins()BT
-OSTA|GlobalSDCCommands()S"\n### 4 GHz clock setup\ncreate_clock -period 0.250 -name clk -waveform \"0 0.125\" clk\nset_clock_uncertainty -setup 0.010 clk\nset_clock_uncertainty -hold 0.010 clk\nset_propagated_clock clk\nset_clock_transition -rise 0.030 clk\nset_clock_transition -fall 0.030 clk\n#set_driving_cell -lib_cell inv_X008_0 clk\n\n### remove scan path from timing\nset_false_path -through */so\nset_false_path -from {sin}\nset_false_path -from {scanEn}\nset_false_path -to {sout}\n"
+OGateLayoutGenerator|enableNCC()SPurpleFour
+OSTA|GlobalSDCCommands()S"\n### 4 GHz clock setup\ncreate_clock -period 0.250 -name clk -waveform \"0 0.125\" clk\nset_clock_uncertainty -setup 0.010 clk\nset_clock_uncertainty -hold 0.010 clk\nset_propagated_clock clk\nset_clock_transition -rise 0.030 clk\nset_clock_transition -fall 0.030 clk\n#set_driving_cell -lib_cell inv_X008_0 clk\n\n### remove scan path from timing\nset_false_path -through */so\nset_false_path -through */*/so\nset_false_path -through */*/*/so\nset_false_path -through */*/*/*/so\nset_false_path -from {sin}\nset_false_path -from {scanEn}\nset_false_path -to {sout}\n"
 
 # Technologies:
-Tcmos90|"GDS(ST)LayerForPad-FrameINcmos90"()S43|"GDS(TSMC)LayerForPad-FrameINcmos90"()S43
-Tmocmos|SelectedFoundryFormocmos()STSMC
+Tartwork|SelectedFoundryForartwork()S""
+Tcmos90|"GDS(TSMC)LayerForOD33INcmos90"()S111
+Ttft|SelectedFoundryFortft()SMOSIS
+
+# Cell DRCme;1{lay}
+CDRCme;1{lay}||tsmcSun40GP|1253744958747|1253752809487|
+Ngeneric:Facet-Center|art@0||0|0||||AV
+Inor3oai;1{lay}|nor3oai@0||-264|262|R||D5G4;
+NPoly-Pin|pin@0||-389|91||||
+NPoly-Pin|pin@1||-286|91||||
+NPoly-Pin|pin@2||-249|-35||||
+NPoly-Pin|pin@3||-146|-35||||
+NPoly-Pin|pin@4||-391|163||||
+NPoly-Pin|pin@5||-288|163||||
+NPoly-Pin|pin@6||-391|253||||
+NPoly-Pin|pin@7||-288|253||||
+NPoly-Pin|pin@8||-234|199||||
+NPoly-Pin|pin@9||-145|199||||
+NPoly-Pin|pin@10||-237|253||||
+NPoly-Pin|pin@11||-145|253||||
+NMetal-1-Pin|pin@12||-271|10||||
+NMetal-1-Pin|pin@13||-256|-12||||
+NMetal-1-Pin|pin@14||-241|280.5||||
+NMetal-1-Pin|pin@15||-286|279.5||||
+Iselect_x16;1{lay}|select_x@0||-259|-50|R||D5G4;
+Iselect_x16;1{lay}|select_x@1||-259|238|R||D5G4;
+Iwells;1{lay}|wells@0||-264|-250|R||D5G4;
+APoly|net@0|||S1800|pin@0||-389|91|pin@1||-286|91
+APoly|net@1|||S1800|pin@2||-249|-35|pin@3||-146|-35
+APoly|net@2|||S1800|pin@4||-391|163|pin@5||-288|163
+APoly|net@3|||S1800|pin@6||-391|253|pin@7||-288|253
+APoly|net@4|||S1800|pin@8||-234|199|pin@9||-145|199
+APoly|net@5|||S1800|pin@10||-237|253|pin@11||-145|253
+AMetal-1|net@6|||S900|nor3oai@0|inb_1|-271|73|pin@12||-271|10
+AMetal-1|net@7|||S900|nor3oai@0|inc_1|-256|37|pin@13||-256|-12
+AMetal-1|net@8|||S2700|nor3oai@0|inc|-241|235|pin@14||-241|280.5
+AMetal-1|net@9|||S2700|nor3oai@0|ina|-286|235|pin@15||-286|279.5
+AMetal-2|net@10|||S2700|wells@0|vdd_2|-369|-253|nor3oai@0|vdd_1|-369|-26
+AMetal-2|net@11|||S2700|wells@0|vdd_1|-339|-253|nor3oai@0|vdd|-339|-26
+AMetal-2|net@12|||S2700|wells@0|vdd|-309|-253|nor3oai@0|vdd_2|-309|-26
+AMetal-2|net@13|||S2700|wells@0|gnd|-219|-227|nor3oai@0|gnd_7|-219|-26.5
+AMetal-2|net@14|||S2700|wells@0|gnd_1|-189|-227|nor3oai@0|gnd_6|-189|-26.5
+AMetal-2|net@15|||S2700|wells@0|gnd_2|-159|-227|nor3oai@0|gnd_5|-159|-26.5
+X
 
 # Cell buf;1{doc}
 Cbuf;1{doc}||artwork|1012171260000|1012171294000||FACET_message()S[This is the one parameter inverter.,Drawn by Ivan Sutherland 27 January 2002,""]
@@ -65,7 +108,7 @@ Eout||D5G2;|conn@0|y|O|ATTR_le(D5G1;NY2;)I1
 X
 
 # Cell contactGallery;1{lay}
-CcontactGallery;1{lay}||tsmcSun40GP|1252818322426|1252875051985|
+CcontactGallery;1{lay}||tsmcSun40GP|1252818322426|1253752420977|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NX-Metal-1-Metal-2-Con|contact@0||-63|-30|||R|
 NMetal-1-Metal-2-Con|contact@1||-135|-30||||
@@ -76,7 +119,7 @@ NXW-Metal-1-Metal-2-Con|contact@5||-63|-45|||R|
 NAWM-Metal-1-Metal-2-Con|contact@6||-99|-60|||R|
 NXWM-Metal-1-Metal-2-Con|contact@7||-63|-60|||R|
 NXDWM1-Metal-1-Metal-2-Con|contact@8||-63|-75|||R|
-NXDWM2-Metal-1-Metal-2-Con|contact@9||-63|-90|||R|
+NX-Metal-1-Metal-2-Con|contact@10||-63|-90||4|R|
 Ngeneric:Invisible-Pin|pin@0||-81|-30|||||ART_message(D5G8;)SX
 Ngeneric:Invisible-Pin|pin@1||-153|-30|||||ART_message(D5G8;)S*
 Ngeneric:Invisible-Pin|pin@2||-153|-45|||||ART_message(D5G8;)SZ
@@ -768,7 +811,7 @@ Evdd_5||D5G2;|pin@16||P
 X
 
 # Cell inverterStudy;1{lay}
-CinverterStudy;1{lay}||tsmcSun40GP|1252802494607|1252824721138||ATTR_NCC(D5G10;NTX65.5;Y178.5;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_area_date()G1252823366734|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1252823366734
+CinverterStudy;1{lay}||tsmcSun40GP|1252802494607|1253748334146||ATTR_NCC(D5G10;NTX65.5;Y178.5;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_area_date()G1252823366734|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1252823366734
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NX-Metal-1-Metal-2-Con|contact@1||90|0|||R|
 NAWM-Metal-1-Metal-2-Con|contact@30||-27|0|-2|2|RRR|
@@ -786,8 +829,8 @@ NMetal-1-Pin|pin@3||-27|-15||||
 NN-Well-Node|plnode@0||72|75|210|136||A
 NPPlus-Node|plnode@1||72|75|204|136||A
 NMetal-1-Node|plnode@3||126|-15|7|7||
-NP-Diff-Node|plnode@4||78|74|249|96||
-NN-Diff-Node|plnode@5||75.5|-87|236|48||
+NP-Diff-Node|plnode@6||78|74|249|96||
+NN-Diff-Node|plnode@7||75.5|-87|236|48||
 Iselect_x16;1{lay}|select_x@2||73|0||A|D5G4;
 Iwells;1{lay}|wells@0||-130|0|||D5G4;
 AMetal-2|net@5|||S1800|inv_x8@0|gnd_9|26.5|-45|inv_x8@1|gnd_7|44.5|-45
@@ -1252,112 +1295,89 @@ Evdd_when_not_disabled||D4G2;|pin@39||I
 X
 
 # Cell nor3;2{lay}
-Cnor3;2{lay}||tsmcSun40GP|1249617237093|1253743395476||ATTR_NCC(D5G10;NTX41;Y217.5;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent vdd_when_not_disabled /vdd_when_not_disabled_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/",exportsConnectedByParent out out1]|DRC_last_good_drc_area_date()G1253743336848|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1253743404915
+Cnor3;2{lay}||tsmcSun40GP|1249617237093|1253752659126||ATTR_NCC(D5G10;NTX41;Y217.5;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent vdd_when_not_disabled /vdd_when_not_disabled_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/",exportsConnectedByParent out out1]|DRC_last_good_drc_area_date()G1253752667233
 Ngeneric:Facet-Center|art@0||0|0||||AV
-NAN-Metal-1-P-Diff-Con|contact@100||0|78|84||R|
-NAN-Metal-1-P-Diff-Con|contact@108||-36|78|84||R|
-NAN-Metal-1-P-Diff-Con|contact@110||36|78|84||R|
-NAN-Metal-1-N-Diff-Con|contact@146||18|-75|60||R|
-NAN-Metal-1-N-Diff-Con|contact@155||36|-75|60||XR|
-NAN-Metal-1-N-Diff-Con|contact@159||36|-75|60||R|
-NA-Metal-1-Poly-Con|contact@183||9|-135||||
-NA-Metal-1-Poly-Con|contact@184||-27|0||||
-NA-Metal-1-Poly-Con|contact@185||9|0||||
-NA-Metal-1-Poly-Con|contact@186||27|-15||||
-NA-Metal-1-Poly-Con|contact@187||-9|-15||||
-NAN-Metal-1-N-Diff-Con|contact@231||0|-75|58||R|
-NXDWM2-Metal-1-Metal-2-Con|contact@232||0|-45||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@233||36|-45||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@234||0|-75||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@235||0|-105||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@236||36|-105||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@237||36|-45||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@238||36|-105||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@239||36|-45||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@240||36|-105||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@241||-36|60||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@242||-36|90||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@243||36|90||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@244||36|60||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@245||36|-75||-4|XR|
+NAN-Metal-1-P-Diff-Con|contact@100||0|83|84||R|
+NAN-Metal-1-P-Diff-Con|contact@108||-36|83|84||R|
+NAN-Metal-1-P-Diff-Con|contact@110||36|83|84||R|
+NA-Metal-1-Poly-Con|contact@183||27|-23||||
+NA-Metal-1-Poly-Con|contact@184||-27|7||||
+NA-Metal-1-Poly-Con|contact@185||27|22||||
+NA-Metal-1-Poly-Con|contact@186||9|7||||
+NA-Metal-1-Poly-Con|contact@187||-9|-8||||
+NAN-Metal-1-N-Diff-Con|contact@247||36|-75|60||R|
+NAN-Metal-1-N-Diff-Con|contact@248||0|-75|60||R|
+NAN-Metal-1-N-Diff-Con|contact@251||18|-75|60||R|
+NX-Metal-1-Metal-2-Con|contact@252||18|-105|||XR|
+NX-Metal-1-Metal-2-Con|contact@253||18|-45|||XR|
+NX-Metal-1-Metal-2-Con|contact@254||18|-75|||XR|
+NX-Metal-1-Metal-2-Con|contact@255||-36|60|||R|
+NX-Metal-1-Metal-2-Con|contact@256||36|60|||R|
+NX-Metal-1-Metal-2-Con|contact@257||0|-90|||XR|
+NX-Metal-1-Metal-2-Con|contact@258||36|-90|||XR|
 NN-Transistor|nmos@4||9|-75|60||YR|
 NN-Transistor|nmos@5||27|-75|60||XYR|
 NMetal-2-Pin|pin@5||-54.5|-105|||R|
 NMetal-2-Pin|pin@9||-54.5|-75|||R|
 NMetal-2-Pin|pin@10||-54.5|-45|||R|
 NMetal-2-Pin|pin@19||54|-45|||R|
-NMetal-1-Pin|pin@29||0|15||||
+NMetal-1-Pin|pin@29||0|22||||
 NMetal-2-Pin|pin@37||54|-75||||
 NMetal-2-Pin|pin@38||54|-105||||
-NMetal-2-Pin|pin@39||-54|90||||
+NMetal-2-Pin|pin@39||-54|60||||
 NMetal-2-Pin|pin@40||-54|75||||
 NMetal-2-Pin|pin@41||-54|105||||
 NMetal-2-Pin|pin@42||-54|45||||
-NMetal-2-Pin|pin@43||-54|60||||
 NMetal-2-Pin|pin@44||54|75||||
 NMetal-2-Pin|pin@45||54|105||||
 NMetal-2-Pin|pin@46||54|45||||
-NMetal-1-Pin|pin@47||18|-30||||
+NMetal-1-Pin|pin@47||0|-23||||
+NMetal-1-Pin|pin@48||27|-8||||
 NprBoundary-Node|plnode@2||0|10|108|270||A
-NN-Well-Node|plnode@7||0|78|210|136||A
-NNPlus-Node|plnode@8||63|-87|78|88||A
-NPPlus-Node|plnode@9||0|78|204|136||A
-NP-Transistor|pmos@11||-27|78|84||XYR|
-NP-Transistor|pmos@12||-9|78|84||XYR|
-NP-Transistor|pmos@13||9|78|84||XYR|
-NP-Transistor|pmos@14||27|78|84||XYR|
+NP-Transistor|pmos@11||-27|83|84||XYR|
+NP-Transistor|pmos@12||-9|83|84||XYR|
+NP-Transistor|pmos@13||9|83|84||XYR|
+NP-Transistor|pmos@14||27|83|84||XYR|
 AP-Diff|net@208|||S1800|pmos@11|diff-top|-18|61|pmos@12|diff-bottom|-18|61
 AP-Diff|net@209|||S1800|pmos@14|diff-bottom|18|62|pmos@13|diff-top|18|62
 AP-Diff|net@211|||S1800|pmos@12|diff-top|0|61|pmos@13|diff-bottom|0|61
 AP-Diff|net@212|||S0|pmos@13|diff-bottom|0|78|contact@100||0|78
 AP-Diff|net@229|||S0|pmos@11|diff-bottom|-36|78|contact@108||-36|78
-AMetal-1|net@259|||S900|contact@100||0|36|pin@29||0|15
-AN-Diff|net@371|||S0|nmos@4|diff-bottom|18|-75|contact@146||18|-75
-AMetal-1|net@373|||S0|contact@233||36|-45|contact@155||36|-45
-AMetal-1|net@375|||S0|contact@236||36|-105|contact@155||36|-105
-AMetal-1|net@377|||S0|contact@237||36|-45|contact@159||36|-45
-AMetal-1|net@379|||S0|contact@238||36|-105|contact@159||36|-105
-AMetal-2|net@386|||S0|contact@238||36|-105|contact@236||36|-105
-AMetal-2|net@387|||S0|contact@237||36|-45|contact@233||36|-45
+AMetal-1|net@259|||S900|contact@100||0|41|pin@29||0|22
 AN-Diff|net@392|||S1800|nmos@5|diff-bottom|18|-64|nmos@4|diff-bottom|18|-64
-AMetal-2|net@393|||S1800|pin@10||-54.5|-45|contact@232||0|-45
-AMetal-2|net@394|||S1800|contact@232||0|-45|contact@233||36|-45
-AMetal-2|net@395|||S1800|contact@233||36|-45|contact@239||36|-45
-AMetal-2|net@396|||S1800|contact@239||36|-45|pin@19||54|-45
-AMetal-2|net@397|||S1800|pin@9||-54.5|-75|contact@234||0|-75
-AMetal-2|net@401|||S1800|pin@5||-54.5|-105|contact@235||0|-105
-AMetal-2|net@402|||S1800|contact@235||0|-105|contact@238||36|-105
-AMetal-2|net@403|||S1800|contact@238||36|-105|contact@240||36|-105
-AMetal-2|net@427|||S0|contact@241||-36|60|pin@43||-54|60
-AMetal-2|net@428|||S0|contact@242||-36|90|pin@39||-54|90
-AMetal-1|net@429|||S0|contact@242||-36|90|contact@108||-36|90
-AMetal-1|net@430|||S0|contact@241||-36|60|contact@108||-36|60
-AMetal-2|net@431|||S0|contact@244||36|60|contact@241||-36|60
-AMetal-2|net@432|||S0|contact@243||36|90|contact@242||-36|90
-AMetal-1|net@433|||S1800|contact@243||36|90|contact@110||36|90
-AMetal-1|net@434|||S1800|contact@244||36|60|contact@110||36|60
-AMetal-2|net@439|||S0|pin@38||54|-105|contact@236||36|-105
+AMetal-2|net@393|||S1800|pin@10||-54.5|-45|contact@253||18|-45
+AMetal-2|net@397|||S1800|pin@9||-54.5|-75|contact@254||18|-75
+AMetal-2|net@401|||S1800|pin@5||-54.5|-105|contact@252||18|-105
+AMetal-2|net@428|||S0|contact@255||-36|60|pin@39||-54|60
+AMetal-1|net@429|||S0|contact@255||-36|60|contact@108||-36|60
+AMetal-2|net@432|||S0|contact@256||36|60|contact@255||-36|60
+AMetal-1|net@433|||S1800|contact@256||36|60|contact@110||36|60
 AMetal-2|net@440|||S1800|pin@41||-54|105|pin@45||54|105
 AMetal-2|net@441|||S1800|pin@40||-54|75|pin@44||54|75
 AMetal-2|net@442|||S1800|pin@42||-54|45|pin@46||54|45
-AMetal-1|net@443|||S2700|contact@146||18|-75|pin@47||18|-30
 AP-Diff|net@448|||S1800|pmos@14|diff-top|36|53|contact@110||36|53
-AMetal-1|net@467|||S0|contact@185||9|0|contact@184||-27|0
-APoly|net@470|||S2700|nmos@5|poly-left|27|-30|contact@186||27|-15
-APoly|net@471|||S2700|contact@186||27|-15|pmos@14|poly-right|27|21
-APoly|net@472|||S900|nmos@4|poly-right|9|-120|contact@183||9|-135
-APoly|net@475|||S900|pmos@13|poly-right|9|21|contact@185||9|0
-APoly|net@476|||S900|pmos@11|poly-right|-27|21|contact@184||-27|0
-APoly|net@477|||S900|pmos@12|poly-right|-9|21|contact@187||-9|-15
-AMetal-1|net@478|||S1800|contact@187||-9|-15|contact@186||27|-15
-AMetal-1|net@479|||S0|contact@245||36|-75|contact@155||36|-75
-AMetal-2|net@480|||S0|contact@245||36|-75|contact@234||0|-75
-AMetal-2|net@481|||S1800|contact@245||36|-75|pin@37||54|-75
-AN-Diff|net@596|||S1800|nmos@5|diff-top|36|-64|contact@159||36|-64
-AN-Diff|net@597|||S0|nmos@4|diff-top|0|-75|contact@231||0|-75
-AMetal-1|net@598|||S900|contact@232||0|-45|contact@231||0|-46
-AMetal-1|net@599|||S0|contact@234||0|-75|contact@231||0|-75
-AMetal-1|net@600|||S2700|contact@235||0|-105|contact@231||0|-104
+APoly|net@476|||S900|pmos@11|poly-right|-27|26|contact@184||-27|7
+APoly|net@477|||S900|pmos@12|poly-right|-9|26|contact@187||-9|-8
+AMetal-2|net@597|||S1800|contact@254||18|-75|pin@37||54|-75
+AMetal-2|net@602|||S0|pin@38||54|-105|contact@252||18|-105
+AMetal-2|net@603|||S0|pin@19||54|-45|contact@253||18|-45
+AN-Diff|net@604|||S0|nmos@5|diff-top|36|-75|contact@247||36|-75
+AN-Diff|net@605|||S0|nmos@4|diff-top|0|-75|contact@248||0|-75
+AMetal-1|net@606|||S0|contact@257||0|-90|contact@248||0|-90
+AMetal-1|net@607|||S0|contact@258||36|-90|contact@247||36|-90
+AMetal-2|net@608|||S0|contact@258||36|-90|contact@257||0|-90
+AMetal-1|net@609|||S900|pin@47||0|-23|contact@248||0|-46
+AN-Diff|net@611|||S0|nmos@5|diff-bottom|18|-75|contact@251||18|-75
+AMetal-1|net@612|||S900|contact@253||18|-45|contact@251||18|-46
+AMetal-1|net@613|||S0|contact@254||18|-75|contact@251||18|-75
+AMetal-1|net@614|||S2700|contact@252||18|-105|contact@251||18|-104
+APoly|net@615|||S900|contact@183||27|-23|nmos@5|poly-left|27|-30
+APoly|net@616|||S900|pmos@14|poly-right|27|26|contact@185||27|22
+APoly|net@618|||S2700|contact@186||9|7|pmos@13|poly-right|9|26
+APoly|net@619|||S900|contact@186||9|7|nmos@4|poly-left|9|-30
+AMetal-1|net@620|||S0|contact@186||9|7|contact@184||-27|7
+AMetal-1|net@621|||S1800|contact@187||-9|-8|pin@48||27|-8
+AMetal-1|net@622|||S2700|pin@48||27|-8|contact@185||27|22
 Egnd||D5G2;|pin@37||G
 Egnd_5||D5G2;|pin@5||U
 Egnd_6||D5G2;|pin@9||U
@@ -1376,7 +1396,6 @@ Evdd_3||D5G2;|pin@44||G
 Evdd_4||D5G2;|pin@45||G
 Evdd_5||D5G2;|pin@46||G
 Egnd_11|vdd_when_not_disabled|D5G2;|pin@39||G
-Evdd_when_not_disabled_1@332241561|vdd_when_not_disabled_1|D5G2;|pin@43||G
 X
 
 # Cell nor3;1{sch}
@@ -1536,22 +1555,22 @@ Evdd_when_not_disabled||D6G2;|pin@140||I
 X
 
 # Cell nor3oai;1{lay}
-Cnor3oai;1{lay}||tsmcSun40GP|1253739194128|1253743096928||ATTR_NCC(D5G10;NTX-144;Y231.5;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent vdd_when_not_disabled /vdd_when_not_disabled_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_area_date()G1253743404915|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1253743338370
+Cnor3oai;1{lay}||tsmcSun40GP|1253739194128|1253752521848||ATTR_NCC(D5G10;NTX-142;Y213.5;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent vdd_when_not_disabled /vdd_when_not_disabled_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_area_date()G1253752674287|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1253752674287
 Ngeneric:Facet-Center|art@0||0|0||||AV
-Inor3;2{lay}|nor3@0||-54|15|||D5G4;
-Ioai;3{lay}|oai@0||-162|15|||D5G4;
-NMetal-1-Pin|pin@0||-81|-15||||
-NMetal-1-Pin|pin@1||-81|0||||
-AMetal-2|net@0|||S1800|nor3@0|vdd_1|-108|120|oai@0|vdd_4|-72|120
-AMetal-2|net@1|||S0|oai@0|vdd_3|-72|90|nor3@0|vdd_when_not_disabled_1|-108|90
-AMetal-2|net@2|||S0|oai@0|vdd_5|-72|60|nor3@0|vdd_2|-108|60
-AMetal-2|net@3|||S0|oai@0|gnd_9|-72|-30|nor3@0|gnd_7|-108.5|-30
-AMetal-2|net@4|||S0|oai@0|gnd|-72|-60|nor3@0|gnd_6|-108.5|-60
-AMetal-2|net@5|||S0|oai@0|gnd_10|-72|-90|nor3@0|gnd_5|-108.5|-90
-AMetal-1|net@7|||S0|nor3@0|out1|-54|30|oai@0|ina|-117|30
-AMetal-1|net@13|||S0|nor3@0|out2|-36|-15|pin@0||-81|-15
-AMetal-1|net@14|||S2700|pin@0||-81|-15|pin@1||-81|0
-AMetal-1|net@15|||S0|pin@1||-81|0|oai@0|in2|-135|0
+Inor3;2{lay}|nor3@0||-54|0|||D5G4;
+Ioai;3{lay}|oai@0||-162|0|||D5G4;
+NMetal-2-Pin|pin@2||-288|60||||
+NMetal-2-Pin|pin@3||0|60||||
+AMetal-2|net@0|||S1800|nor3@0|vdd_1|-108|105|oai@0|vdd_4|-72|105
+AMetal-2|net@1|||S0|oai@0|vdd_3|-72|75|nor3@0|vdd_when_not_disabled_1|-108|75
+AMetal-2|net@2|||S0|oai@0|vdd_5|-72|45|nor3@0|vdd_2|-108|45
+AMetal-2|net@3|||S0|oai@0|gnd_9|-72|-45|nor3@0|gnd_7|-108.5|-45
+AMetal-2|net@4|||S0|oai@0|gnd|-72|-75|nor3@0|gnd_6|-108.5|-75
+AMetal-2|net@5|||S0|oai@0|gnd_10|-72|-105|nor3@0|gnd_5|-108.5|-105
+AMetal-2|net@16|||S1800|pin@2||-288|60|nor3@0|gnd_11|-108|60
+AMetal-2|net@17|||S0|pin@3||0|60|nor3@0|gnd_11|-108|60
+AMetal-1|net@20|||S0|nor3@0|out1|-54|22|oai@0|ina|-134|22
+AMetal-1|net@21|||S0|nor3@0|out2|-54|-23|oai@0|in2|-84|-23
 Einc|disable|D5G2;|nor3@0|inc|I
 Egnd||D5G2;|nor3@0|gnd|G
 Egnd_5||D5G2;|oai@0|gnd_5|U
@@ -1570,12 +1589,12 @@ Evdd_2||D5G2;|oai@0|vdd_2|G
 Evdd_3||D5G2;|nor3@0|vdd_3|G
 Evdd_4||D5G2;|nor3@0|vdd_4|G
 Evdd_5||D5G2;|nor3@0|vdd_5|G
-Evdd_when_not_disabled||D5G2;|nor3@0|gnd_11|G
-Evdd_when_not_disabled_1||D5G2;|nor3@0|vdd_when_not_disabled_1@332241561|G
+Evdd_when_not_disabled||D5G2;|pin@2||I
+Evdd_when_not_disabled_1|vdd_when_not_disabled_2|D5G2;|pin@3||I
 X
 
 # Cell nor3oai;1{sch}
-Cnor3oai;1{sch}||schematic|1253518699023|1253739637073|
+Cnor3oai;1{sch}||schematic|1253518699023|1253747742729|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-16|-9|||R|
 NOff-Page|conn@1||-14|-9|||R|
@@ -1595,7 +1614,7 @@ NWire_Pin|pin@4||-17.25|2||||
 NWire_Pin|pin@5||-16.25|25||||
 NWire_Pin|pin@6||-16|25||||
 NWire_Pin|pin@8||-14|5||||
-Iorange40nm:wire40;1{ic}|wire40@0||-6.5|5|||D5G4;|ATTR_L(D5FLeave alone;G1;PUD)D1284.0|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S1|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
+Iorange40nm:wire40;1{ic}|wire40@0||-6.5|5|||D5G4;|ATTR_L(D5FLeave alone;G1;PUD)D1400.5|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S1|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
 Awire|net@0|||2700|conn@0|y|-16|-7|nor3@1|ina|-16|-3.5
 Awire|net@1|||2700|conn@2|y|-12|-7|nor3@1|inc|-12|-3.5
 Awire|net@2|||2700|conn@1|y|-14|-7|nor3@1|inb|-14|-3.5
@@ -1677,56 +1696,58 @@ EfireHI|out|D5G1;RX1.5;|pin@16||O
 X
 
 # Cell oai;3{lay}
-Coai;3{lay}||tsmcSun40GP|1249617237093|1253743275925||ATTR_NCC(D5G10;NTX-22;Y217.5;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent vdd_when_not_disabled /vdd_when_not_disabled_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_area_date()G1253743222518|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1253743278680
+Coai;3{lay}||tsmcSun40GP|1249617237093|1253752498352||ATTR_NCC(D5G10;NTX-13;Y217.5;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent vdd_when_not_disabled /vdd_when_not_disabled_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_area_date()G1253749927851|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1253752521849
 Ngeneric:Facet-Center|art@0||0|0||||AV
-NA-Metal-1-Poly-Con|contact@106||45|15||||
-NAN-Metal-1-P-Diff-Con|contact@110||54|78|84||R|
+NA-Metal-1-Poly-Con|contact@106||27|22|2|||
+NAN-Metal-1-P-Diff-Con|contact@110||54|83|84||R|
 NAN-Metal-1-N-Diff-Con|contact@146||90|-75|58||R|
-NAN-Metal-1-P-Diff-Con|contact@178||18|78|84||R|
-NAN-Metal-1-P-Diff-Con|contact@182||36|78|84||R|
-NAN-Metal-1-P-Diff-Con|contact@183||0|78|84||R|
+NAN-Metal-1-P-Diff-Con|contact@178||18|83|84||R|
+NAN-Metal-1-P-Diff-Con|contact@182||36|83|84||R|
+NAN-Metal-1-P-Diff-Con|contact@183||0|83|84||R|
 NAN-Metal-1-N-Diff-Con|contact@184||54|-75|60||R|
 NAN-Metal-1-N-Diff-Con|contact@188||36|-75|60||R|
-NA-Metal-1-Poly-Con|contact@189||27|-15||||
+NA-Metal-1-Poly-Con|contact@189||54|-23|48|||
 NAN-Metal-1-N-Diff-Con|contact@190||18|-75|60||R|
 NAN-Metal-1-N-Diff-Con|contact@195||54|-75|60||R|
 NAN-Metal-1-N-Diff-Con|contact@198||-18|-75|60||XR|
 NAN-Metal-1-N-Diff-Con|contact@200||0|-75|60||R|
 NAN-Metal-1-N-Diff-Con|contact@202||-54|-75|60||XR|
 NAN-Metal-1-N-Diff-Con|contact@204||-36|-75|60||R|
-NA-Metal-1-Poly-Con|contact@206||-45|0||||
+NA-Metal-1-Poly-Con|contact@206||-27|7|2|||
 NAN-Metal-1-N-Diff-Con|contact@207||-54|-75|60||R|
 NAN-Metal-1-N-Diff-Con|contact@209||-90|-75|60||XR|
 NAN-Metal-1-N-Diff-Con|contact@211||-72|-75|60||R|
 NAN-Metal-1-N-Diff-Con|contact@213||-126|-75|60||XR|
 NAN-Metal-1-N-Diff-Con|contact@215||-108|-75|60||R|
-NA-Metal-1-Poly-Con|contact@217||-117|-15||||
-NXDWM2-Metal-1-Metal-2-Con|contact@218||72|-45||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@219||72|-75||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@220||72|-105||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@221||54|45||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@222||54|75||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@223||54|105||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@224||18|45||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@225||18|75||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@226||18|105||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@227||36|-45||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@228||36|-75||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@229||36|-105||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@230||18|-60||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@231||54|-60||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@232||54|-60||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@233||90|-60||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@234||-18|-60||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@235||0|-90||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@236||-54|-60||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@237||-36|-90||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@238||-54|-60||-4|R|
-NXDWM2-Metal-1-Metal-2-Con|contact@239||-90|-60||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@240||-72|-90||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@241||-126|-60||-4|XR|
-NXDWM2-Metal-1-Metal-2-Con|contact@242||-108|-90||-4|XR|
+NA-Metal-1-Poly-Con|contact@217||-63|-8|2|||
 NAN-Metal-1-N-Diff-Con|contact@243||72|-75|58||R|
+NX-Metal-1-Metal-2-Con|contact@246||72|-45|||XR|
+NX-Metal-1-Metal-2-Con|contact@247||72|-75|||XR|
+NX-Metal-1-Metal-2-Con|contact@248||72|-105|||XR|
+NX-Metal-1-Metal-2-Con|contact@249||54|45|||R|
+NX-Metal-1-Metal-2-Con|contact@250||54|75|||R|
+NX-Metal-1-Metal-2-Con|contact@251||54|105|||R|
+NX-Metal-1-Metal-2-Con|contact@252||18|45|||R|
+NX-Metal-1-Metal-2-Con|contact@253||18|75|||R|
+NX-Metal-1-Metal-2-Con|contact@254||18|105|||R|
+NX-Metal-1-Metal-2-Con|contact@255||36|-45|||XR|
+NX-Metal-1-Metal-2-Con|contact@256||36|-75|||XR|
+NX-Metal-1-Metal-2-Con|contact@257||36|-105|||XR|
+NX-Metal-1-Metal-2-Con|contact@258||18|-60|||R|
+NX-Metal-1-Metal-2-Con|contact@259||54|-60|||R|
+NX-Metal-1-Metal-2-Con|contact@260||54|-60|||R|
+NX-Metal-1-Metal-2-Con|contact@261||90|-60|||R|
+NX-Metal-1-Metal-2-Con|contact@262||-18|-60|||XR|
+NX-Metal-1-Metal-2-Con|contact@263||0|-90|||XR|
+NX-Metal-1-Metal-2-Con|contact@264||-54|-60|||XR|
+NX-Metal-1-Metal-2-Con|contact@265||-36|-90|||XR|
+NX-Metal-1-Metal-2-Con|contact@266||-54|-60|||R|
+NX-Metal-1-Metal-2-Con|contact@267||-90|-60|||XR|
+NX-Metal-1-Metal-2-Con|contact@268||-72|-90|||XR|
+NX-Metal-1-Metal-2-Con|contact@269||-126|-60|||XR|
+NX-Metal-1-Metal-2-Con|contact@270||-108|-90|||XR|
+NX-Metal-1-Metal-2-Con|contact@271||0|90|||R|
+NX-Metal-1-Metal-2-Con|contact@272||36|90|||R|
 NN-Transistor|nmos@4||81|-75|60||YR|
 NN-Transistor|nmos@6||45|-75|60||YR|
 NN-Transistor|nmos@7||63|-75|60||XYR|
@@ -1739,166 +1760,158 @@ NN-Transistor|nmos@16||-117|-75|60||XYR|
 NN-Transistor|nmos@17||-99|-75|60||YR|
 NN-Transistor|nmos@18||-63|-75|60||YR|
 NN-Transistor|nmos@19||27|-75|60||YR|
-NMetal-2-Pin|pin@5||-171.5|-105|||R|
-NMetal-2-Pin|pin@9||-171.5|-75|||R|
-NMetal-2-Pin|pin@10||-171.5|-45|||R|
+NMetal-2-Pin|pin@5||-126.5|-105|||R|
+NMetal-2-Pin|pin@9||-126.5|-75|||R|
+NMetal-2-Pin|pin@10||-126.5|-45|||R|
 NMetal-2-Pin|pin@19||90|-45|||R|
 NMetal-2-Pin|pin@37||90|-75||||
 NMetal-2-Pin|pin@38||90|-105||||
-NMetal-2-Pin|pin@40||-54|75||||
-NMetal-2-Pin|pin@41||-54|105||||
-NMetal-2-Pin|pin@42||-54|45||||
+NMetal-2-Pin|pin@40||-126|75||||
+NMetal-2-Pin|pin@41||-126|105||||
+NMetal-2-Pin|pin@42||-126|45||||
 NMetal-2-Pin|pin@44||90|75||||
 NMetal-2-Pin|pin@45||90|105||||
 NMetal-2-Pin|pin@46||90|45||||
-NMetal-1-Pin|pin@48||0|163||||
-NMetal-1-Pin|pin@49||36|163||||
-NMetal-1-Pin|pin@50||0|30||||
-NMetal-1-Pin|pin@51||-125|30||||
-NMetal-1-Pin|pin@54||-36|-15||||
-NMetal-1-Pin|pin@55||-72|-15||||
-NMetal-1-Pin|pin@56||-72|30||||
-NPoly-Pin|pin@57||-63|-15||||
-NPoly-Pin|pin@58||-99|-15||||
-NPoly-Pin|pin@59||-81|-15||||
-NPoly-Pin|pin@60||9|0||||
-NPoly-Pin|pin@61||-9|0||||
-NPoly-Pin|pin@62||-27|0||||
-NPoly-Pin|pin@63||81|-23||||
-NPoly-Pin|pin@64||45|-15||||
-NPoly-Pin|pin@65||63|-23||||
-NPoly-Pin|pin@66||9|15||||
-NPoly-Pin|pin@67||27|15||||
-NPoly-Pin|pin@68||45|-23||||
-NprBoundary-Node|plnode@2||0|10|108|270||A
+NMetal-1-Pin|pin@51||0|22||||
+NPoly-Pin|pin@57||-63|-8||||
+NPoly-Pin|pin@58||-99|-8||||
+NPoly-Pin|pin@59||-81|-8||||
+NPoly-Pin|pin@60||9|7||||
+NPoly-Pin|pin@61||-9|7||||
+NPoly-Pin|pin@62||-27|7||||
+NPoly-Pin|pin@66||9|22||||
+NPoly-Pin|pin@67||27|22||||
+NPoly-Pin|pin@69||-45|7||||
+NPoly-Pin|pin@70||-117|-8||||
+NPoly-Pin|pin@71||27|-23||||
+NPoly-Pin|pin@74||45|22||||
+NPoly-Pin|pin@75||81|-23||||
+NPoly-Pin|pin@76||45|-23||||
+NprBoundary-Node|plnode@2||-18|10|216|270||A
 NN-Well-Node|plnode@7||0|78|210|136||A
-NNPlus-Node|plnode@8||63|-87|78|88||A
 NPPlus-Node|plnode@9||0|78|204|136||A
-NP-Transistor|pmos@14||45|78|84||XYR|
-NP-Transistor|pmos@15||9|78|84||XYR|
-NP-Transistor|pmos@16||27|78|84||XYR|
+NP-Transistor|pmos@14||45|83|84||XYR|
+NP-Transistor|pmos@15||9|83|84||XYR|
+NP-Transistor|pmos@16||27|83|84||XYR|
 AN-Diff|net@371|||S0|nmos@4|diff-bottom|90|-75|contact@146||90|-75
 AP-Diff|net@448|||S1800|pmos@14|diff-top|54|53|contact@110||54|53
-AMetal-1|net@449|||S0|contact@223||54|105|contact@110||54|105
-AMetal-1|net@450|||S0|contact@222||54|75|contact@110||54|75
-AMetal-1|net@451|||S0|contact@221||54|45|contact@110||54|45
-AMetal-2|net@452|||S0|pin@44||90|75|contact@222||54|75
-AMetal-2|net@453|||S0|pin@45||90|105|contact@223||54|105
-AMetal-2|net@454|||S0|pin@46||90|45|contact@221||54|45
+AMetal-1|net@449|||S0|contact@251||54|105|contact@110||54|105
+AMetal-1|net@450|||S0|contact@250||54|75|contact@110||54|75
+AMetal-1|net@451|||S0|contact@249||54|45|contact@110||54|45
+AMetal-2|net@452|||S0|pin@44||90|75|contact@250||54|75
+AMetal-2|net@453|||S0|pin@45||90|105|contact@251||54|105
+AMetal-2|net@454|||S0|pin@46||90|45|contact@249||54|45
 AP-Diff|net@455|||S1800|pmos@15|diff-top|18|53|contact@178||18|53
-AMetal-1|net@456|||S0|contact@226||18|105|contact@178||18|105
-AMetal-1|net@457|||S0|contact@225||18|75|contact@178||18|75
-AMetal-1|net@458|||S0|contact@224||18|45|contact@178||18|45
+AMetal-1|net@456|||S0|contact@254||18|105|contact@178||18|105
+AMetal-1|net@457|||S0|contact@253||18|75|contact@178||18|75
+AMetal-1|net@458|||S0|contact@252||18|45|contact@178||18|45
 AP-Diff|net@459|||S0|pmos@15|diff-top|18|65|pmos@16|diff-bottom|18|65
 AP-Diff|net@460|||S0|pmos@14|diff-bottom|36|60|pmos@16|diff-top|36|60
-AMetal-2|net@461|||S1800|contact@224||18|45|contact@221||54|45
-AMetal-2|net@462|||S0|contact@222||54|75|contact@225||18|75
-AMetal-2|net@463|||S0|contact@223||54|105|contact@226||18|105
+AMetal-2|net@461|||S1800|contact@252||18|45|contact@249||54|45
+AMetal-2|net@462|||S0|contact@250||54|75|contact@253||18|75
+AMetal-2|net@463|||S0|contact@251||54|105|contact@254||18|105
 AP-Diff|net@464|||S0|pmos@14|diff-bottom|36|78|contact@182||36|78
 AP-Diff|net@465|||S0|pmos@15|diff-bottom|0|78|contact@183||0|78
-AMetal-1|net@466|||S2700|contact@183||0|78|pin@48||0|163
-AMetal-1|net@467|||S1800|pin@48||0|163|pin@49||36|163
-AMetal-1|net@468|||S2700|contact@182||36|120|pin@49||36|163
-AMetal-1|net@469|||S900|contact@183||0|78|pin@50||0|30
-AMetal-2|net@471|||S1800|pin@42||-54|45|contact@224||18|45
-AMetal-2|net@472|||S1800|pin@40||-54|75|contact@225||18|75
-AMetal-2|net@473|||S1800|pin@41||-54|105|contact@226||18|105
+AMetal-2|net@471|||S1800|pin@42||-126|45|contact@252||18|45
+AMetal-2|net@472|||S1800|pin@40||-126|75|contact@253||18|75
+AMetal-2|net@473|||S1800|pin@41||-126|105|contact@254||18|105
 AN-Diff|net@474|||S0|nmos@6|diff-top|36|-75|contact@188||36|-75
-AMetal-1|net@475|||S0|contact@227||36|-45|contact@188||36|-45
-AMetal-1|net@476|||S0|contact@228||36|-75|contact@188||36|-75
-AMetal-1|net@477|||S0|contact@229||36|-105|contact@188||36|-105
+AMetal-1|net@475|||S0|contact@255||36|-45|contact@188||36|-45
+AMetal-1|net@476|||S0|contact@256||36|-75|contact@188||36|-75
+AMetal-1|net@477|||S0|contact@257||36|-105|contact@188||36|-105
 AN-Diff|net@478|||S0|nmos@6|diff-bottom|54|-75|contact@184||54|-75
 AN-Diff|net@479|||S0|nmos@7|diff-bottom|54|-64|nmos@6|diff-bottom|54|-64
 AN-Diff|net@481|||S1800|nmos@7|diff-top|72|-91|nmos@4|diff-top|72|-91
 AN-Diff|net@496|||S0|nmos@8|diff-bottom|18|-75|contact@190||18|-75
-AMetal-1|net@497|||S0|contact@230||18|-60|contact@190||18|-60
-AMetal-1|net@498|||S0|contact@231||54|-60|contact@184||54|-60
-AMetal-1|net@500|||S1800|contact@232||54|-60|contact@195||54|-60
-AMetal-1|net@501|||S0|contact@233||90|-60|contact@146||90|-60
-AMetal-2|net@502|||S0|contact@233||90|-60|contact@231||54|-60
-AMetal-2|net@505|||S0|contact@231||54|-60|contact@230||18|-60
+AMetal-1|net@497|||S0|contact@258||18|-60|contact@190||18|-60
+AMetal-1|net@498|||S0|contact@259||54|-60|contact@184||54|-60
+AMetal-1|net@500|||S1800|contact@260||54|-60|contact@195||54|-60
+AMetal-1|net@501|||S0|contact@261||90|-60|contact@146||90|-60
+AMetal-2|net@502|||S0|contact@261||90|-60|contact@259||54|-60
+AMetal-2|net@505|||S0|contact@259||54|-60|contact@258||18|-60
 AN-Diff|net@506|||S0|nmos@12|diff-bottom|-18|-75|contact@198||-18|-75
-AMetal-1|net@507|||S0|contact@234||-18|-60|contact@198||-18|-60
+AMetal-1|net@507|||S0|contact@262||-18|-60|contact@198||-18|-60
 AN-Diff|net@508|||S1800|nmos@12|diff-top|0|-94|nmos@8|diff-top|0|-94
-AMetal-2|net@509|||S1800|contact@234||-18|-60|contact@230||18|-60
+AMetal-2|net@509|||S1800|contact@262||-18|-60|contact@258||18|-60
 AN-Diff|net@510|||S0|nmos@8|diff-top|0|-75|contact@200||0|-75
-AMetal-1|net@511|||S0|contact@235||0|-90|contact@200||0|-90
+AMetal-1|net@511|||S0|contact@263||0|-90|contact@200||0|-90
 AN-Diff|net@513|||S0|nmos@13|diff-bottom|-54|-75|contact@202||-54|-75
-AMetal-1|net@514|||S0|contact@236||-54|-60|contact@202||-54|-60
+AMetal-1|net@514|||S0|contact@264||-54|-60|contact@202||-54|-60
 AN-Diff|net@515|||S1800|nmos@13|diff-top|-36|-94|nmos@14|diff-top|-36|-94
 AN-Diff|net@516|||S0|nmos@14|diff-top|-36|-75|contact@204||-36|-75
-AMetal-1|net@517|||S0|contact@237||-36|-90|contact@204||-36|-90
+AMetal-1|net@517|||S0|contact@265||-36|-90|contact@204||-36|-90
 AN-Diff|net@518|||S1800|nmos@14|diff-bottom|-18|-76|nmos@12|diff-bottom|-18|-76
-AMetal-2|net@519|||S1800|contact@236||-54|-60|contact@234||-18|-60
-AMetal-2|net@520|||S1800|contact@237||-36|-90|contact@235||0|-90
+AMetal-2|net@519|||S1800|contact@264||-54|-60|contact@262||-18|-60
+AMetal-2|net@520|||S1800|contact@265||-36|-90|contact@263||0|-90
 AN-Diff|net@526|||S0|nmos@18|diff-bottom|-54|-75|contact@207||-54|-75
-AMetal-1|net@527|||S0|contact@238||-54|-60|contact@207||-54|-60
+AMetal-1|net@527|||S0|contact@266||-54|-60|contact@207||-54|-60
 AN-Diff|net@528|||S0|nmos@15|diff-bottom|-90|-75|contact@209||-90|-75
-AMetal-1|net@529|||S0|contact@239||-90|-60|contact@209||-90|-60
+AMetal-1|net@529|||S0|contact@267||-90|-60|contact@209||-90|-60
 AN-Diff|net@530|||S1800|nmos@15|diff-top|-72|-94|nmos@18|diff-top|-72|-94
-AMetal-2|net@531|||S1800|contact@239||-90|-60|contact@238||-54|-60
+AMetal-2|net@531|||S1800|contact@267||-90|-60|contact@266||-54|-60
 AN-Diff|net@532|||S0|nmos@18|diff-top|-72|-75|contact@211||-72|-75
-AMetal-1|net@533|||S0|contact@240||-72|-90|contact@211||-72|-90
+AMetal-1|net@533|||S0|contact@268||-72|-90|contact@211||-72|-90
 AN-Diff|net@534|||S0|nmos@16|diff-bottom|-126|-75|contact@213||-126|-75
-AMetal-1|net@535|||S0|contact@241||-126|-60|contact@213||-126|-60
+AMetal-1|net@535|||S0|contact@269||-126|-60|contact@213||-126|-60
 AN-Diff|net@536|||S1800|nmos@16|diff-top|-108|-94|nmos@17|diff-top|-108|-94
 AN-Diff|net@537|||S0|nmos@17|diff-top|-108|-75|contact@215||-108|-75
-AMetal-1|net@538|||S0|contact@242||-108|-90|contact@215||-108|-90
+AMetal-1|net@538|||S0|contact@270||-108|-90|contact@215||-108|-90
 AN-Diff|net@539|||S1800|nmos@17|diff-bottom|-90|-76|nmos@15|diff-bottom|-90|-76
-AMetal-2|net@540|||S1800|contact@241||-126|-60|contact@239||-90|-60
-AMetal-2|net@541|||S1800|contact@242||-108|-90|contact@240||-72|-90
-AMetal-2|net@546|||S1800|contact@238||-54|-60|contact@236||-54|-60
-AMetal-2|net@547|||S1800|contact@240||-72|-90|contact@237||-36|-90
-AMetal-1|net@548|||S2700|contact@204||-36|-75|pin@54||-36|-15
-AMetal-1|net@549|||S0|pin@54||-36|-15|pin@55||-72|-15
-AMetal-1|net@550|||S0|pin@50||0|30|pin@56||-72|30
-AMetal-1|net@551|||S0|pin@56||-72|30|pin@51||-125|30
-AMetal-1|net@552|||S2700|pin@55||-72|-15|pin@56||-72|30
-AMetal-2|net@553|||S1800|pin@9||-171.5|-75|contact@228||36|-75
-AMetal-2|net@554|||S1800|contact@228||36|-75|contact@219||72|-75
-AMetal-2|net@555|||S1800|pin@10||-171.5|-45|contact@227||36|-45
-AMetal-2|net@556|||S1800|contact@227||36|-45|contact@218||72|-45
-AMetal-2|net@557|||S1800|pin@5||-171.5|-105|contact@229||36|-105
-AMetal-2|net@558|||S1800|contact@229||36|-105|contact@220||72|-105
-AMetal-2|net@559|||S1800|contact@219||72|-75|pin@37||90|-75
-AMetal-2|net@561|||S0|pin@19||90|-45|contact@218||72|-45
-AMetal-2|net@563|||S1800|contact@220||72|-105|pin@38||90|-105
+AMetal-2|net@540|||S1800|contact@269||-126|-60|contact@267||-90|-60
+AMetal-2|net@541|||S1800|contact@270||-108|-90|contact@268||-72|-90
+AMetal-2|net@546|||S1800|contact@266||-54|-60|contact@264||-54|-60
+AMetal-2|net@547|||S1800|contact@268||-72|-90|contact@265||-36|-90
+AMetal-2|net@553|||S1800|pin@9||-126.5|-75|contact@256||36|-75
+AMetal-2|net@554|||S1800|contact@256||36|-75|contact@247||72|-75
+AMetal-2|net@555|||S1800|pin@10||-126.5|-45|contact@255||36|-45
+AMetal-2|net@556|||S1800|contact@255||36|-45|contact@246||72|-45
+AMetal-2|net@557|||S1800|pin@5||-126.5|-105|contact@257||36|-105
+AMetal-2|net@558|||S1800|contact@257||36|-105|contact@248||72|-105
+AMetal-2|net@559|||S1800|contact@247||72|-75|pin@37||90|-75
+AMetal-2|net@561|||S0|pin@19||90|-45|contact@246||72|-45
+AMetal-2|net@563|||S1800|contact@248||72|-105|pin@38||90|-105
 AN-Diff|net@564|||S1800|nmos@19|diff-bottom|36|-88|nmos@6|diff-top|36|-88
 AN-Diff|net@565|||S0|nmos@19|diff-top|18|-85|nmos@8|diff-bottom|18|-85
-APoly|net@570|||S900|contact@217||-117|-15|nmos@16|poly-left|-117|-30
-APoly|net@571|||S2700|nmos@18|poly-left|-63|-30|pin@57||-63|-15
-APoly|net@574|||S0|pin@58||-99|-15|contact@217||-117|-15
-APoly|net@575|||S2700|nmos@17|poly-left|-99|-30|pin@58||-99|-15
-APoly|net@576|||S0|pin@57||-63|-15|pin@59||-81|-15
-APoly|net@577|||S0|pin@59||-81|-15|pin@58||-99|-15
-APoly|net@578|||S2700|nmos@15|poly-left|-81|-30|pin@59||-81|-15
-APoly|net@579|||S2700|nmos@13|poly-left|-45|-30|contact@206||-45|0
-APoly|net@580|||S2700|nmos@8|poly-left|9|-30|pin@60||9|0
-APoly|net@582|||S0|pin@60||9|0|pin@61||-9|0
-APoly|net@584|||S2700|nmos@12|poly-left|-9|-30|pin@61||-9|0
-APoly|net@585|||S0|pin@61||-9|0|pin@62||-27|0
-APoly|net@586|||S0|pin@62||-27|0|contact@206||-45|0
-APoly|net@587|||S2700|nmos@14|poly-left|-27|-30|pin@62||-27|0
-APoly|net@588|||S2700|nmos@19|poly-left|27|-30|contact@189||27|-15
-APoly|net@589|||S2700|nmos@4|poly-left|81|-30|pin@63||81|-23
-APoly|net@592|||S0|pin@64||45|-15|contact@189||27|-15
-APoly|net@596|||S2700|nmos@7|poly-left|63|-30|pin@65||63|-23
-APoly|net@597|||S900|pmos@15|poly-right|9|21|pin@66||9|15
-APoly|net@599|||S900|pmos@14|poly-right|45|21|contact@106||45|15
-APoly|net@600|||S1800|pin@66||9|15|pin@67||27|15
-APoly|net@601|||S1800|pin@67||27|15|contact@106||45|15
-APoly|net@602|||S900|pmos@16|poly-right|27|21|pin@67||27|15
-APoly|net@604|||S2700|contact@189||27|-15|pin@67||27|15
-APoly|net@605|||S2700|nmos@6|poly-left|45|-30|pmos@14|poly-right|45|21
+APoly|net@571|||S2700|nmos@18|poly-left|-63|-30|pin@57||-63|-8
+APoly|net@574|||S1800|pin@58||-99|-8|contact@217||-63|-8
+APoly|net@575|||S2700|nmos@17|poly-left|-99|-30|pin@58||-99|-8
+APoly|net@576|||S0|pin@57||-63|-8|pin@59||-81|-8
+APoly|net@577|||S0|pin@59||-81|-8|pin@58||-99|-8
+APoly|net@578|||S2700|nmos@15|poly-left|-81|-30|pin@59||-81|-8
+APoly|net@580|||S2700|nmos@8|poly-left|9|-30|pin@60||9|7
+APoly|net@582|||S0|pin@60||9|7|pin@61||-9|7
+APoly|net@584|||S2700|nmos@12|poly-left|-9|-30|pin@61||-9|7
+APoly|net@585|||S0|pin@61||-9|7|pin@62||-27|7
+APoly|net@586|||S0|pin@62||-27|7|contact@206||-27|7
+APoly|net@587|||S2700|nmos@14|poly-left|-27|-30|pin@62||-27|7
+APoly|net@597|||S900|pmos@15|poly-right|9|26|pin@66||9|22
+APoly|net@600|||S1800|pin@66||9|22|pin@67||27|22
+APoly|net@601|||S1800|pin@67||27|22|contact@106||27|22
+APoly|net@602|||S900|pmos@16|poly-right|27|26|pin@67||27|22
 AMetal-1|net@606|||S0|contact@195||54|-90|contact@184||54|-90
-APoly|net@607|||S1800|pin@65||63|-23|pin@63||81|-23
-APoly|net@608|||S2700|nmos@6|poly-left|45|-30|pin@68||45|-23
-APoly|net@609|||S2700|pin@68||45|-23|pin@64||45|-15
-APoly|net@610|||S0|pin@65||63|-23|pin@68||45|-23
 AN-Diff|net@680|||S0|nmos@4|diff-top|72|-75|contact@243||72|-75
-AMetal-1|net@681|||S900|contact@218||72|-45|contact@243||72|-46
-AMetal-1|net@682|||S0|contact@219||72|-75|contact@243||72|-75
-AMetal-1|net@683|||S2700|contact@220||72|-105|contact@243||72|-104
+AMetal-1|net@681|||S900|contact@246||72|-45|contact@243||72|-46
+AMetal-1|net@682|||S0|contact@247||72|-75|contact@243||72|-75
+AMetal-1|net@683|||S2700|contact@248||72|-105|contact@243||72|-104
+AMetal-2|net@684|||S0|contact@272||36|90|contact@271||0|90
+AMetal-1|net@685|||S0|contact@271||0|90|contact@183||0|90
+AMetal-1|net@686|||S0|contact@272||36|90|contact@182||36|90
+APoly|net@687|||S0|pin@62||-27|7|pin@69||-45|7
+APoly|net@688|||S2700|nmos@13|poly-left|-45|-30|pin@69||-45|7
+AMetal-1|net@695|||S2700|pin@51||0|22|contact@183||0|41
+AMetal-1|net@696|||S900|pin@51||0|22|contact@200||0|-45
+APoly|net@697|||S0|pin@58||-99|-8|pin@70||-117|-8
+APoly|net@698|||S2700|nmos@16|poly-left|-117|-30|pin@70||-117|-8
+APoly|net@708|||S2700|pin@71||27|-23|pin@67||27|22
+APoly|net@709|||S900|pmos@14|poly-right|45|26|pin@74||45|22
+APoly|net@710|||S1800|contact@106||28|22|pin@74||45|22
+APoly|net@713|||S1800|contact@189||63|-23|pin@75||81|-23
+APoly|net@714|||S2700|nmos@4|poly-left|81|-30|pin@75||81|-23
+APoly|net@715|||S2700|nmos@7|poly-left|63|-30|contact@189||63|-23
+APoly|net@716|||S0|contact@189||63|-23|pin@76||45|-23
+APoly|net@717|||S0|pin@76||45|-23|pin@71||27|-23
+APoly|net@718|||S2700|nmos@6|poly-left|45|-30|pin@76||45|-23
+APoly|net@719|||S2700|nmos@19|poly-left|27|-30|pin@71||27|-23
 Egnd||D5G2;|pin@37||G
 Egnd_5||D5G2;|pin@5||U
 Egnd_6||D5G2;|pin@9||U
-- 
1.7.10.4