diff --git a/alliance/share/cells/rflib/rf_dec_bufad0.ap b/alliance/share/cells/rflib/rf_dec_bufad0.ap
index bde6898e..2af0ad41 100644
--- a/alliance/share/cells/rflib/rf_dec_bufad0.ap
+++ b/alliance/share/cells/rflib/rf_dec_bufad0.ap
@@ -1,82 +1,78 @@
 V ALLIANCE : 6
-H rf_dec_bufad0,P,10/11/2000,10
+H rf_dec_bufad0,P,15/ 3/2001,10
 A 0,0,450,500
-S 50,0,150,0,20,*,RIGHT,TALU2
-S 250,300,250,300,20,q,LEFT,CALU2
-S 150,250,150,250,20,nq,LEFT,CALU2
-S 50,100,50,400,10,i,UP,CALU1
-S 140,100,140,400,20,*,DOWN,ALU1
-S 50,200,170,200,30,*,RIGHT,POLY
-S 200,280,200,470,30,*,DOWN,PDIF
-S 390,290,390,480,30,*,UP,NTIE
-S 320,280,320,470,30,*,DOWN,PDIF
-S 290,260,290,490,10,*,UP,PTRANS
-S 140,280,140,470,30,*,DOWN,PDIF
-S 110,260,110,490,10,*,UP,PTRANS
-S 170,260,170,490,10,*,UP,PTRANS
-S 260,280,260,470,30,*,DOWN,PDIF
-S 230,260,230,490,10,*,UP,PTRANS
-S 80,280,80,470,30,*,DOWN,PDIF
-S 170,10,170,140,10,*,DOWN,NTRANS
-S 110,10,110,140,10,*,DOWN,NTRANS
-S 290,10,290,140,10,*,DOWN,NTRANS
-S 230,10,230,140,10,*,DOWN,NTRANS
-S 320,30,320,120,30,*,UP,NDIF
-S 140,30,140,120,30,*,UP,NDIF
-S 80,30,80,120,30,*,UP,NDIF
-S 260,30,260,120,30,*,UP,NDIF
-S 200,30,200,120,30,*,UP,NDIF
-S 390,20,390,160,30,*,DOWN,PTIE
-S 210,150,290,150,30,*,RIGHT,POLY
-S 290,140,290,260,10,*,UP,POLY
-S 230,140,230,260,10,*,UP,POLY
-S 170,140,170,260,10,*,UP,POLY
-S 110,140,110,260,10,*,UP,POLY
-S 260,100,260,400,20,*,DOWN,ALU1
-S 390,30,390,150,20,*,DOWN,ALU1
-S 390,300,390,470,20,*,UP,ALU1
-S 200,50,200,100,20,*,UP,ALU1
-S 200,300,200,450,20,*,DOWN,ALU1
-S 150,150,210,150,20,*,RIGHT,ALU1
-S 320,50,320,100,20,*,DOWN,ALU1
-S 320,300,320,450,20,*,UP,ALU1
-S 0,30,450,30,60,vss,RIGHT,CALU1
-S 0,470,450,470,60,vdd,RIGHT,CALU1
 S 0,390,450,390,240,*,LEFT,NWELL
-S 100,0,100,500,120,vss,UP,CALU3
-V 50,200,CONT_POLY,*
-V 390,300,CONT_BODY_N,*
-V 80,450,CONT_DIF_P,*
-V 200,450,CONT_DIF_P,*
-V 390,470,CONT_BODY_N,*
-V 390,400,CONT_BODY_N,*
-V 390,350,CONT_BODY_N,*
-V 320,300,CONT_DIF_P,*
-V 320,400,CONT_DIF_P,*
-V 260,400,CONT_DIF_P,*
-V 260,350,CONT_DIF_P,*
-V 260,300,CONT_DIF_P,*
-V 140,350,CONT_DIF_P,*
-V 140,300,CONT_DIF_P,*
-V 140,400,CONT_DIF_P,*
-V 200,400,CONT_DIF_P,*
-V 200,350,CONT_DIF_P,*
-V 200,300,CONT_DIF_P,*
-V 320,450,CONT_DIF_P,*
-V 320,350,CONT_DIF_P,*
-V 140,100,CONT_DIF_N,*
-V 260,100,CONT_DIF_N,*
-V 80,50,CONT_DIF_N,*
-V 200,50,CONT_DIF_N,*
-V 200,100,CONT_DIF_N,*
-V 320,50,CONT_DIF_N,*
-V 320,100,CONT_DIF_N,*
-V 390,100,CONT_BODY_P,*
-V 390,30,CONT_BODY_P,*
-V 390,150,CONT_BODY_P,*
-V 210,150,CONT_POLY,*
-V 250,300,CONT_VIA,*
+S 0,470,450,470,60,vdd,RIGHT,CALU1
+S 0,30,450,30,60,vss,RIGHT,CALU1
+S 320,300,320,450,20,*,UP,ALU1
+S 320,50,320,100,20,*,DOWN,ALU1
+S 150,150,210,150,20,*,RIGHT,ALU1
+S 200,300,200,450,20,*,DOWN,ALU1
+S 200,50,200,100,20,*,UP,ALU1
+S 390,300,390,470,20,*,UP,ALU1
+S 390,30,390,150,20,*,DOWN,ALU1
+S 260,100,260,400,20,*,DOWN,ALU1
+S 110,140,110,260,10,*,UP,POLY
+S 170,140,170,260,10,*,UP,POLY
+S 230,140,230,260,10,*,UP,POLY
+S 290,140,290,260,10,*,UP,POLY
+S 210,150,290,150,30,*,RIGHT,POLY
+S 390,20,390,160,30,*,DOWN,PTIE
+S 200,30,200,120,30,*,UP,NDIF
+S 260,30,260,120,30,*,UP,NDIF
+S 80,30,80,120,30,*,UP,NDIF
+S 140,30,140,120,30,*,UP,NDIF
+S 320,30,320,120,30,*,UP,NDIF
+S 230,10,230,140,10,*,DOWN,NTRANS
+S 290,10,290,140,10,*,DOWN,NTRANS
+S 110,10,110,140,10,*,DOWN,NTRANS
+S 170,10,170,140,10,*,DOWN,NTRANS
+S 80,280,80,470,30,*,DOWN,PDIF
+S 230,260,230,490,10,*,UP,PTRANS
+S 260,280,260,470,30,*,DOWN,PDIF
+S 170,260,170,490,10,*,UP,PTRANS
+S 110,260,110,490,10,*,UP,PTRANS
+S 140,280,140,470,30,*,DOWN,PDIF
+S 290,260,290,490,10,*,UP,PTRANS
+S 320,280,320,470,30,*,DOWN,PDIF
+S 390,290,390,480,30,*,UP,NTIE
+S 200,280,200,470,30,*,DOWN,PDIF
+S 50,200,170,200,30,*,RIGHT,POLY
+S 140,100,140,400,20,*,DOWN,ALU1
+S 50,100,50,400,10,i,UP,CALU1
+S 150,250,150,250,20,nq,LEFT,CALU2
+S 250,300,250,300,20,q,LEFT,CALU2
 V 150,250,CONT_VIA,*
-B 100,0,120,20,CONT_VIA,*
-B 100,0,120,20,CONT_VIA2,*
+V 250,300,CONT_VIA,*
+V 210,150,CONT_POLY,*
+V 390,150,CONT_BODY_P,*
+V 390,30,CONT_BODY_P,*
+V 390,100,CONT_BODY_P,*
+V 320,100,CONT_DIF_N,*
+V 320,50,CONT_DIF_N,*
+V 200,100,CONT_DIF_N,*
+V 200,50,CONT_DIF_N,*
+V 80,50,CONT_DIF_N,*
+V 260,100,CONT_DIF_N,*
+V 140,100,CONT_DIF_N,*
+V 320,350,CONT_DIF_P,*
+V 320,450,CONT_DIF_P,*
+V 200,300,CONT_DIF_P,*
+V 200,350,CONT_DIF_P,*
+V 200,400,CONT_DIF_P,*
+V 140,400,CONT_DIF_P,*
+V 140,300,CONT_DIF_P,*
+V 140,350,CONT_DIF_P,*
+V 260,300,CONT_DIF_P,*
+V 260,350,CONT_DIF_P,*
+V 260,400,CONT_DIF_P,*
+V 320,400,CONT_DIF_P,*
+V 320,300,CONT_DIF_P,*
+V 390,350,CONT_BODY_N,*
+V 390,400,CONT_BODY_N,*
+V 390,470,CONT_BODY_N,*
+V 200,450,CONT_DIF_P,*
+V 80,450,CONT_DIF_P,*
+V 390,300,CONT_BODY_N,*
+V 50,200,CONT_POLY,*
 EOF
diff --git a/alliance/share/cells/rflib/rf_dec_bufad1.ap b/alliance/share/cells/rflib/rf_dec_bufad1.ap
index df8fc9d0..052e0c81 100644
--- a/alliance/share/cells/rflib/rf_dec_bufad1.ap
+++ b/alliance/share/cells/rflib/rf_dec_bufad1.ap
@@ -1,94 +1,90 @@
 V ALLIANCE : 6
-H rf_dec_bufad1,P,10/11/2000,10
+H rf_dec_bufad1,P,15/ 3/2001,10
 A 0,0,500,500
-S 50,0,150,0,20,*,RIGHT,TALU2
-S 200,200,280,200,30,*,RIGHT,POLY
-S 300,200,370,200,20,*,RIGHT,ALU1
-S 250,150,320,150,20,*,RIGHT,ALU1
-S 250,100,250,400,20,*,DOWN,ALU1
-S 200,200,300,200,20,*,RIGHT,TALU2
-S 200,200,200,200,20,i,LEFT,CALU3
-S 250,200,250,200,20,nq,LEFT,CALU3
-S 300,200,300,200,20,q,LEFT,CALU3
-S 100,290,100,480,30,*,UP,NTIE
-S 100,20,100,160,30,*,DOWN,PTIE
-S 100,30,100,150,20,*,DOWN,ALU1
-S 100,300,100,470,20,*,UP,ALU1
-S 400,260,400,490,10,*,UP,PTRANS
-S 430,280,430,470,30,*,DOWN,PDIF
-S 310,280,310,470,30,*,DOWN,PDIF
-S 190,280,190,470,30,*,DOWN,PDIF
-S 340,260,340,490,10,*,UP,PTRANS
-S 370,280,370,470,30,*,DOWN,PDIF
-S 280,260,280,490,10,*,UP,PTRANS
-S 220,260,220,490,10,*,UP,PTRANS
-S 250,280,250,470,30,*,DOWN,PDIF
-S 340,10,340,140,10,*,DOWN,NTRANS
-S 400,10,400,140,10,*,DOWN,NTRANS
-S 220,10,220,140,10,*,DOWN,NTRANS
-S 280,10,280,140,10,*,DOWN,NTRANS
-S 310,30,310,120,30,*,UP,NDIF
-S 370,30,370,120,30,*,UP,NDIF
-S 190,30,190,120,30,*,UP,NDIF
-S 250,30,250,120,30,*,UP,NDIF
-S 430,30,430,120,30,*,UP,NDIF
-S 220,140,220,260,10,*,UP,POLY
-S 280,140,280,260,10,*,UP,POLY
-S 340,140,340,260,10,*,UP,POLY
-S 400,140,400,260,10,*,UP,POLY
-S 320,150,400,150,30,*,RIGHT,POLY
-S 310,300,310,450,20,*,DOWN,ALU1
-S 310,50,310,100,20,*,UP,ALU1
-S 190,50,190,100,20,*,DOWN,ALU1
-S 190,300,190,450,20,*,UP,ALU1
-S 370,100,370,400,20,*,DOWN,ALU1
-S 430,300,430,450,20,*,UP,ALU1
-S 430,50,430,100,20,*,DOWN,ALU1
-S 0,390,500,390,240,*,LEFT,NWELL
-S 0,470,500,470,60,vdd,RIGHT,CALU1
 S 0,30,500,30,60,vss,RIGHT,CALU1
-S 100,0,100,500,120,vss,UP,CALU3
-V 200,200,CONT_POLY,*
-V 300,200,CONT_VIA,*
-V 250,200,CONT_VIA,*
-V 200,200,CONT_VIA,*
-V 300,200,CONT_VIA2,*
-V 250,200,CONT_VIA2,*
-V 200,200,CONT_VIA2,*
-V 100,470,CONT_BODY_N,*
-V 100,400,CONT_BODY_N,*
-V 100,350,CONT_BODY_N,*
-V 100,300,CONT_BODY_N,*
-V 100,100,CONT_BODY_P,*
-V 100,30,CONT_BODY_P,*
-V 100,150,CONT_BODY_P,*
-V 310,400,CONT_DIF_P,*
-V 370,350,CONT_DIF_P,*
-V 370,400,CONT_DIF_P,*
-V 430,400,CONT_DIF_P,*
-V 430,300,CONT_DIF_P,*
-V 430,350,CONT_DIF_P,*
-V 430,450,CONT_DIF_P,*
-V 310,300,CONT_DIF_P,*
-V 310,350,CONT_DIF_P,*
-V 190,400,CONT_DIF_P,*
-V 190,350,CONT_DIF_P,*
-V 190,300,CONT_DIF_P,*
-V 190,450,CONT_DIF_P,*
-V 250,400,CONT_DIF_P,*
-V 250,300,CONT_DIF_P,*
-V 250,350,CONT_DIF_P,*
-V 370,300,CONT_DIF_P,*
-V 310,450,CONT_DIF_P,*
-V 370,100,CONT_DIF_N,*
-V 250,100,CONT_DIF_N,*
-V 430,100,CONT_DIF_N,*
-V 430,50,CONT_DIF_N,*
-V 310,100,CONT_DIF_N,*
-V 310,50,CONT_DIF_N,*
-V 190,50,CONT_DIF_N,*
-V 190,100,CONT_DIF_N,*
+S 0,470,500,470,60,vdd,RIGHT,CALU1
+S 0,390,500,390,240,*,LEFT,NWELL
+S 430,50,430,100,20,*,DOWN,ALU1
+S 430,300,430,450,20,*,UP,ALU1
+S 370,100,370,400,20,*,DOWN,ALU1
+S 190,300,190,450,20,*,UP,ALU1
+S 190,50,190,100,20,*,DOWN,ALU1
+S 310,50,310,100,20,*,UP,ALU1
+S 310,300,310,450,20,*,DOWN,ALU1
+S 320,150,400,150,30,*,RIGHT,POLY
+S 400,140,400,260,10,*,UP,POLY
+S 340,140,340,260,10,*,UP,POLY
+S 280,140,280,260,10,*,UP,POLY
+S 220,140,220,260,10,*,UP,POLY
+S 430,30,430,120,30,*,UP,NDIF
+S 250,30,250,120,30,*,UP,NDIF
+S 190,30,190,120,30,*,UP,NDIF
+S 370,30,370,120,30,*,UP,NDIF
+S 310,30,310,120,30,*,UP,NDIF
+S 280,10,280,140,10,*,DOWN,NTRANS
+S 220,10,220,140,10,*,DOWN,NTRANS
+S 400,10,400,140,10,*,DOWN,NTRANS
+S 340,10,340,140,10,*,DOWN,NTRANS
+S 250,280,250,470,30,*,DOWN,PDIF
+S 220,260,220,490,10,*,UP,PTRANS
+S 280,260,280,490,10,*,UP,PTRANS
+S 370,280,370,470,30,*,DOWN,PDIF
+S 340,260,340,490,10,*,UP,PTRANS
+S 190,280,190,470,30,*,DOWN,PDIF
+S 310,280,310,470,30,*,DOWN,PDIF
+S 430,280,430,470,30,*,DOWN,PDIF
+S 400,260,400,490,10,*,UP,PTRANS
+S 100,300,100,470,20,*,UP,ALU1
+S 100,30,100,150,20,*,DOWN,ALU1
+S 100,20,100,160,30,*,DOWN,PTIE
+S 100,290,100,480,30,*,UP,NTIE
+S 300,200,300,200,20,q,LEFT,CALU3
+S 250,200,250,200,20,nq,LEFT,CALU3
+S 200,200,200,200,20,i,LEFT,CALU3
+S 200,200,300,200,20,*,RIGHT,TALU2
+S 250,100,250,400,20,*,DOWN,ALU1
+S 250,150,320,150,20,*,RIGHT,ALU1
+S 300,200,370,200,20,*,RIGHT,ALU1
+S 200,200,280,200,30,*,RIGHT,POLY
 V 320,150,CONT_POLY,*
-B 100,0,120,20,CONT_VIA,*
-B 100,0,120,20,CONT_VIA2,*
+V 190,100,CONT_DIF_N,*
+V 190,50,CONT_DIF_N,*
+V 310,50,CONT_DIF_N,*
+V 310,100,CONT_DIF_N,*
+V 430,50,CONT_DIF_N,*
+V 430,100,CONT_DIF_N,*
+V 250,100,CONT_DIF_N,*
+V 370,100,CONT_DIF_N,*
+V 310,450,CONT_DIF_P,*
+V 370,300,CONT_DIF_P,*
+V 250,350,CONT_DIF_P,*
+V 250,300,CONT_DIF_P,*
+V 250,400,CONT_DIF_P,*
+V 190,450,CONT_DIF_P,*
+V 190,300,CONT_DIF_P,*
+V 190,350,CONT_DIF_P,*
+V 190,400,CONT_DIF_P,*
+V 310,350,CONT_DIF_P,*
+V 310,300,CONT_DIF_P,*
+V 430,450,CONT_DIF_P,*
+V 430,350,CONT_DIF_P,*
+V 430,300,CONT_DIF_P,*
+V 430,400,CONT_DIF_P,*
+V 370,400,CONT_DIF_P,*
+V 370,350,CONT_DIF_P,*
+V 310,400,CONT_DIF_P,*
+V 100,150,CONT_BODY_P,*
+V 100,30,CONT_BODY_P,*
+V 100,100,CONT_BODY_P,*
+V 100,300,CONT_BODY_N,*
+V 100,350,CONT_BODY_N,*
+V 100,400,CONT_BODY_N,*
+V 100,470,CONT_BODY_N,*
+V 200,200,CONT_VIA2,*
+V 250,200,CONT_VIA2,*
+V 300,200,CONT_VIA2,*
+V 200,200,CONT_VIA,*
+V 250,200,CONT_VIA,*
+V 300,200,CONT_VIA,*
+V 200,200,CONT_POLY,*
 EOF
diff --git a/alliance/share/cells/rflib/rf_dec_bufad1r.ap b/alliance/share/cells/rflib/rf_dec_bufad1r.ap
deleted file mode 100644
index 2565594c..00000000
--- a/alliance/share/cells/rflib/rf_dec_bufad1r.ap
+++ /dev/null
@@ -1,94 +0,0 @@
-V ALLIANCE : 6
-H rf_dec_bufad1r,P,10/11/2000,10
-A 0,0,500,500
-S 50,500,150,500,20,*,RIGHT,TALU2
-S 0,30,500,30,60,vss,RIGHT,CALU1
-S 0,470,500,470,60,vdd,RIGHT,CALU1
-S 0,390,500,390,240,*,LEFT,NWELL
-S 430,50,430,100,20,*,DOWN,ALU1
-S 430,300,430,450,20,*,UP,ALU1
-S 370,100,370,400,20,*,DOWN,ALU1
-S 190,300,190,450,20,*,UP,ALU1
-S 190,50,190,100,20,*,DOWN,ALU1
-S 310,50,310,100,20,*,UP,ALU1
-S 310,300,310,450,20,*,DOWN,ALU1
-S 320,150,400,150,30,*,RIGHT,POLY
-S 400,140,400,260,10,*,UP,POLY
-S 340,140,340,260,10,*,UP,POLY
-S 280,140,280,260,10,*,UP,POLY
-S 220,140,220,260,10,*,UP,POLY
-S 430,30,430,120,30,*,UP,NDIF
-S 250,30,250,120,30,*,UP,NDIF
-S 190,30,190,120,30,*,UP,NDIF
-S 370,30,370,120,30,*,UP,NDIF
-S 310,30,310,120,30,*,UP,NDIF
-S 280,10,280,140,10,*,DOWN,NTRANS
-S 220,10,220,140,10,*,DOWN,NTRANS
-S 400,10,400,140,10,*,DOWN,NTRANS
-S 340,10,340,140,10,*,DOWN,NTRANS
-S 250,280,250,470,30,*,DOWN,PDIF
-S 220,260,220,490,10,*,UP,PTRANS
-S 280,260,280,490,10,*,UP,PTRANS
-S 370,280,370,470,30,*,DOWN,PDIF
-S 340,260,340,490,10,*,UP,PTRANS
-S 190,280,190,470,30,*,DOWN,PDIF
-S 310,280,310,470,30,*,DOWN,PDIF
-S 430,280,430,470,30,*,DOWN,PDIF
-S 400,260,400,490,10,*,UP,PTRANS
-S 100,300,100,470,20,*,UP,ALU1
-S 100,30,100,150,20,*,DOWN,ALU1
-S 100,20,100,160,30,*,DOWN,PTIE
-S 100,290,100,480,30,*,UP,NTIE
-S 300,200,300,200,20,q,LEFT,CALU3
-S 250,200,250,200,20,nq,LEFT,CALU3
-S 200,200,200,200,20,i,LEFT,CALU3
-S 200,200,300,200,20,*,RIGHT,TALU2
-S 250,100,250,400,20,*,DOWN,ALU1
-S 250,150,320,150,20,*,RIGHT,ALU1
-S 300,200,370,200,20,*,RIGHT,ALU1
-S 200,200,280,200,30,*,RIGHT,POLY
-S 100,0,100,500,120,vdd,UP,CALU3
-V 320,150,CONT_POLY,*
-V 190,100,CONT_DIF_N,*
-V 190,50,CONT_DIF_N,*
-V 310,50,CONT_DIF_N,*
-V 310,100,CONT_DIF_N,*
-V 430,50,CONT_DIF_N,*
-V 430,100,CONT_DIF_N,*
-V 250,100,CONT_DIF_N,*
-V 370,100,CONT_DIF_N,*
-V 310,450,CONT_DIF_P,*
-V 370,300,CONT_DIF_P,*
-V 250,350,CONT_DIF_P,*
-V 250,300,CONT_DIF_P,*
-V 250,400,CONT_DIF_P,*
-V 190,450,CONT_DIF_P,*
-V 190,300,CONT_DIF_P,*
-V 190,350,CONT_DIF_P,*
-V 190,400,CONT_DIF_P,*
-V 310,350,CONT_DIF_P,*
-V 310,300,CONT_DIF_P,*
-V 430,450,CONT_DIF_P,*
-V 430,350,CONT_DIF_P,*
-V 430,300,CONT_DIF_P,*
-V 430,400,CONT_DIF_P,*
-V 370,400,CONT_DIF_P,*
-V 370,350,CONT_DIF_P,*
-V 310,400,CONT_DIF_P,*
-V 100,150,CONT_BODY_P,*
-V 100,30,CONT_BODY_P,*
-V 100,100,CONT_BODY_P,*
-V 100,300,CONT_BODY_N,*
-V 100,350,CONT_BODY_N,*
-V 100,400,CONT_BODY_N,*
-V 100,470,CONT_BODY_N,*
-V 200,200,CONT_VIA2,*
-V 250,200,CONT_VIA2,*
-V 300,200,CONT_VIA2,*
-V 200,200,CONT_VIA,*
-V 250,200,CONT_VIA,*
-V 300,200,CONT_VIA,*
-V 200,200,CONT_POLY,*
-B 100,500,120,20,CONT_VIA2,*
-B 100,500,120,20,CONT_VIA,*
-EOF
diff --git a/alliance/share/cells/rflib/rf_dec_bufad1r.vbe b/alliance/share/cells/rflib/rf_dec_bufad1r.vbe
deleted file mode 100644
index 791c3a27..00000000
--- a/alliance/share/cells/rflib/rf_dec_bufad1r.vbe
+++ /dev/null
@@ -1,21 +0,0 @@
-ENTITY rf_dec_bufad1r IS
-PORT (
-  i      : in  BIT;
-  nq  	 : out BIT;
-  q  	 : out BIT;
-  vdd	 : in  BIT;
-  vss	 : in  BIT
-);
-END rf_dec_bufad1r;
-
-ARCHITECTURE VBE OF rf_dec_bufad1r IS
-
-BEGIN
-  ASSERT (vdd and not (vss))
-  REPORT "power supply is missing on rf_dec_bufad1r"
-  SEVERITY WARNING;
-
-  nq <= not i;
-  q  <= not nq;
-
-END;
diff --git a/alliance/share/cells/rflib/rf_dec_bufad2.ap b/alliance/share/cells/rflib/rf_dec_bufad2.ap
index 51232036..75204720 100644
--- a/alliance/share/cells/rflib/rf_dec_bufad2.ap
+++ b/alliance/share/cells/rflib/rf_dec_bufad2.ap
@@ -1,139 +1,135 @@
 V ALLIANCE : 6
-H rf_dec_bufad2,P,10/11/2000,10
+H rf_dec_bufad2,P,15/ 3/2001,10
 A 0,0,500,500
-S 50,0,150,0,20,*,RIGHT,TALU2
-S 450,200,450,200,20,q1,LEFT,CALU3
-S 350,200,350,200,20,nq1,LEFT,CALU3
-S 300,200,300,200,20,nq0,LEFT,CALU3
-S 200,200,200,200,20,q0,LEFT,CALU3
-S 0,470,500,470,60,vdd,RIGHT,CALU1
-S 0,30,500,30,60,vss,RIGHT,CALU1
-S 150,280,150,470,30,*,DOWN,PDIF
-S 30,280,30,470,30,*,DOWN,PDIF
-S 30,50,30,100,20,*,DOWN,ALU1
-S 30,300,30,450,20,*,UP,ALU1
-S 180,260,180,490,10,*,UP,PTRANS
-S 210,280,210,470,30,*,DOWN,PDIF
-S 120,260,120,490,10,*,UP,PTRANS
-S 60,260,60,490,10,*,UP,PTRANS
-S 90,280,90,470,30,*,DOWN,PDIF
-S 180,10,180,140,10,*,DOWN,NTRANS
-S 240,10,240,140,10,*,DOWN,NTRANS
-S 60,10,60,140,10,*,DOWN,NTRANS
-S 120,10,120,140,10,*,DOWN,NTRANS
-S 150,30,150,120,30,*,UP,NDIF
-S 210,30,210,120,30,*,UP,NDIF
-S 30,30,30,120,30,*,UP,NDIF
-S 90,30,90,120,30,*,UP,NDIF
-S 240,260,240,490,10,*,UP,PTRANS
-S 180,140,180,260,10,*,UP,POLY
-S 240,140,240,260,10,*,UP,POLY
-S 0,390,500,390,240,*,LEFT,NWELL
-S 270,300,270,450,20,*,UP,ALU1
-S 270,50,270,100,20,*,DOWN,ALU1
-S 450,100,450,400,20,*,DOWN,ALU1
-S 510,50,510,100,20,*,DOWN,ALU1
-S 510,300,510,450,20,*,UP,ALU1
-S 300,140,300,260,10,*,UP,POLY
-S 360,140,360,260,10,*,UP,POLY
-S 400,150,480,150,30,*,RIGHT,POLY
-S 390,30,390,120,30,*,UP,NDIF
-S 450,30,450,120,30,*,UP,NDIF
-S 510,30,510,120,30,*,UP,NDIF
-S 270,30,270,120,30,*,UP,NDIF
-S 330,30,330,120,30,*,UP,NDIF
-S 300,10,300,140,10,*,DOWN,NTRANS
-S 360,10,360,140,10,*,DOWN,NTRANS
-S 420,10,420,140,10,*,DOWN,NTRANS
-S 480,10,480,140,10,*,DOWN,NTRANS
-S 360,260,360,490,10,*,UP,PTRANS
-S 270,280,270,470,30,*,DOWN,PDIF
-S 300,260,300,490,10,*,UP,PTRANS
-S 450,280,450,470,30,*,DOWN,PDIF
-S 480,260,480,490,10,*,UP,PTRANS
-S 390,280,390,470,30,*,DOWN,PDIF
-S 420,260,420,490,10,*,UP,PTRANS
-S 510,280,510,470,30,*,DOWN,PDIF
-S 330,280,330,470,30,*,DOWN,PDIF
-S 400,200,400,200,20,i1,LEFT,CALU3
-S 400,250,480,250,30,*,RIGHT,POLY
-S 300,200,400,200,30,*,RIGHT,POLY
-S 350,100,350,400,20,*,UP,ALU1
-S 330,400,350,400,20,*,RIGHT,ALU1
-S 330,350,350,350,20,*,RIGHT,ALU1
-S 330,300,350,300,20,*,RIGHT,ALU1
-S 330,100,350,100,20,*,RIGHT,ALU1
-S 350,250,400,250,20,*,RIGHT,ALU1
-S 350,150,400,150,20,*,RIGHT,ALU1
-S 300,150,300,250,20,*,DOWN,ALU1
-S 210,100,210,150,20,*,DOWN,ALU1
-S 210,250,210,400,20,*,UP,ALU1
-S 250,200,250,200,20,i0,LEFT,CALU3
-S 90,100,90,400,20,*,DOWN,ALU1
-S 60,250,140,250,30,*,RIGHT,POLY
-S 60,150,140,150,30,*,RIGHT,POLY
-S 140,250,300,250,20,*,RIGHT,ALU1
-S 140,150,300,150,20,*,LEFT,ALU1
-S 180,200,250,200,30,*,RIGHT,POLY
-S 90,200,200,200,20,*,RIGHT,ALU1
 S 200,200,450,200,20,*,LEFT,TALU2
-S 100,0,100,500,120,vss,UP,CALU3
-V 150,50,CONT_DIF_N,*
-V 150,450,CONT_DIF_P,*
-V 30,400,CONT_DIF_P,*
-V 30,350,CONT_DIF_P,*
-V 30,300,CONT_DIF_P,*
-V 30,50,CONT_DIF_N,*
-V 30,100,CONT_DIF_N,*
-V 30,450,CONT_DIF_P,*
-V 90,400,CONT_DIF_P,*
-V 90,300,CONT_DIF_P,*
-V 90,350,CONT_DIF_P,*
-V 210,300,CONT_DIF_P,*
-V 210,350,CONT_DIF_P,*
-V 210,400,CONT_DIF_P,*
-V 210,100,CONT_DIF_N,*
-V 90,100,CONT_DIF_N,*
-V 400,150,CONT_POLY,*
-V 270,100,CONT_DIF_N,*
-V 270,50,CONT_DIF_N,*
-V 330,100,CONT_DIF_N,*
-V 510,50,CONT_DIF_N,*
-V 510,100,CONT_DIF_N,*
-V 390,50,CONT_DIF_N,*
-V 450,100,CONT_DIF_N,*
-V 510,400,CONT_DIF_P,*
-V 510,450,CONT_DIF_P,*
-V 390,450,CONT_DIF_P,*
-V 450,300,CONT_DIF_P,*
-V 450,350,CONT_DIF_P,*
-V 450,400,CONT_DIF_P,*
-V 270,400,CONT_DIF_P,*
-V 330,300,CONT_DIF_P,*
-V 330,350,CONT_DIF_P,*
-V 330,400,CONT_DIF_P,*
-V 270,300,CONT_DIF_P,*
-V 270,350,CONT_DIF_P,*
-V 510,350,CONT_DIF_P,*
-V 510,300,CONT_DIF_P,*
-V 270,450,CONT_DIF_P,*
-V 350,200,CONT_VIA2,*
-V 450,200,CONT_VIA2,*
-V 400,200,CONT_VIA2,*
-V 350,200,CONT_VIA,*
-V 450,200,CONT_VIA,*
-V 400,200,CONT_VIA,*
-V 200,200,CONT_VIA,*
-V 250,200,CONT_VIA,*
-V 300,200,CONT_VIA,*
-V 400,250,CONT_POLY,*
-V 400,200,CONT_POLY,*
-V 250,200,CONT_POLY,*
-V 250,200,CONT_VIA2,*
-V 300,200,CONT_VIA2,*
-V 200,200,CONT_VIA2,*
-V 140,250,CONT_POLY,*
+S 90,200,200,200,20,*,RIGHT,ALU1
+S 180,200,250,200,30,*,RIGHT,POLY
+S 140,150,300,150,20,*,LEFT,ALU1
+S 140,250,300,250,20,*,RIGHT,ALU1
+S 60,150,140,150,30,*,RIGHT,POLY
+S 60,250,140,250,30,*,RIGHT,POLY
+S 90,100,90,400,20,*,DOWN,ALU1
+S 250,200,250,200,20,i0,LEFT,CALU3
+S 210,250,210,400,20,*,UP,ALU1
+S 210,100,210,150,20,*,DOWN,ALU1
+S 300,150,300,250,20,*,DOWN,ALU1
+S 350,150,400,150,20,*,RIGHT,ALU1
+S 350,250,400,250,20,*,RIGHT,ALU1
+S 330,100,350,100,20,*,RIGHT,ALU1
+S 330,300,350,300,20,*,RIGHT,ALU1
+S 330,350,350,350,20,*,RIGHT,ALU1
+S 330,400,350,400,20,*,RIGHT,ALU1
+S 350,100,350,400,20,*,UP,ALU1
+S 300,200,400,200,30,*,RIGHT,POLY
+S 400,250,480,250,30,*,RIGHT,POLY
+S 400,200,400,200,20,i1,LEFT,CALU3
+S 330,280,330,470,30,*,DOWN,PDIF
+S 510,280,510,470,30,*,DOWN,PDIF
+S 420,260,420,490,10,*,UP,PTRANS
+S 390,280,390,470,30,*,DOWN,PDIF
+S 480,260,480,490,10,*,UP,PTRANS
+S 450,280,450,470,30,*,DOWN,PDIF
+S 300,260,300,490,10,*,UP,PTRANS
+S 270,280,270,470,30,*,DOWN,PDIF
+S 360,260,360,490,10,*,UP,PTRANS
+S 480,10,480,140,10,*,DOWN,NTRANS
+S 420,10,420,140,10,*,DOWN,NTRANS
+S 360,10,360,140,10,*,DOWN,NTRANS
+S 300,10,300,140,10,*,DOWN,NTRANS
+S 330,30,330,120,30,*,UP,NDIF
+S 270,30,270,120,30,*,UP,NDIF
+S 510,30,510,120,30,*,UP,NDIF
+S 450,30,450,120,30,*,UP,NDIF
+S 390,30,390,120,30,*,UP,NDIF
+S 400,150,480,150,30,*,RIGHT,POLY
+S 360,140,360,260,10,*,UP,POLY
+S 300,140,300,260,10,*,UP,POLY
+S 510,300,510,450,20,*,UP,ALU1
+S 510,50,510,100,20,*,DOWN,ALU1
+S 450,100,450,400,20,*,DOWN,ALU1
+S 270,50,270,100,20,*,DOWN,ALU1
+S 270,300,270,450,20,*,UP,ALU1
+S 0,390,500,390,240,*,LEFT,NWELL
+S 240,140,240,260,10,*,UP,POLY
+S 180,140,180,260,10,*,UP,POLY
+S 240,260,240,490,10,*,UP,PTRANS
+S 90,30,90,120,30,*,UP,NDIF
+S 30,30,30,120,30,*,UP,NDIF
+S 210,30,210,120,30,*,UP,NDIF
+S 150,30,150,120,30,*,UP,NDIF
+S 120,10,120,140,10,*,DOWN,NTRANS
+S 60,10,60,140,10,*,DOWN,NTRANS
+S 240,10,240,140,10,*,DOWN,NTRANS
+S 180,10,180,140,10,*,DOWN,NTRANS
+S 90,280,90,470,30,*,DOWN,PDIF
+S 60,260,60,490,10,*,UP,PTRANS
+S 120,260,120,490,10,*,UP,PTRANS
+S 210,280,210,470,30,*,DOWN,PDIF
+S 180,260,180,490,10,*,UP,PTRANS
+S 30,300,30,450,20,*,UP,ALU1
+S 30,50,30,100,20,*,DOWN,ALU1
+S 30,280,30,470,30,*,DOWN,PDIF
+S 150,280,150,470,30,*,DOWN,PDIF
+S 0,30,500,30,60,vss,RIGHT,CALU1
+S 0,470,500,470,60,vdd,RIGHT,CALU1
+S 200,200,200,200,20,q0,LEFT,CALU3
+S 300,200,300,200,20,nq0,LEFT,CALU3
+S 350,200,350,200,20,nq1,LEFT,CALU3
+S 450,200,450,200,20,q1,LEFT,CALU3
 V 140,150,CONT_POLY,*
-B 100,0,120,20,CONT_VIA,*
-B 100,0,120,20,CONT_VIA2,*
+V 140,250,CONT_POLY,*
+V 200,200,CONT_VIA2,*
+V 300,200,CONT_VIA2,*
+V 250,200,CONT_VIA2,*
+V 250,200,CONT_POLY,*
+V 400,200,CONT_POLY,*
+V 400,250,CONT_POLY,*
+V 300,200,CONT_VIA,*
+V 250,200,CONT_VIA,*
+V 200,200,CONT_VIA,*
+V 400,200,CONT_VIA,*
+V 450,200,CONT_VIA,*
+V 350,200,CONT_VIA,*
+V 400,200,CONT_VIA2,*
+V 450,200,CONT_VIA2,*
+V 350,200,CONT_VIA2,*
+V 270,450,CONT_DIF_P,*
+V 510,300,CONT_DIF_P,*
+V 510,350,CONT_DIF_P,*
+V 270,350,CONT_DIF_P,*
+V 270,300,CONT_DIF_P,*
+V 330,400,CONT_DIF_P,*
+V 330,350,CONT_DIF_P,*
+V 330,300,CONT_DIF_P,*
+V 270,400,CONT_DIF_P,*
+V 450,400,CONT_DIF_P,*
+V 450,350,CONT_DIF_P,*
+V 450,300,CONT_DIF_P,*
+V 390,450,CONT_DIF_P,*
+V 510,450,CONT_DIF_P,*
+V 510,400,CONT_DIF_P,*
+V 450,100,CONT_DIF_N,*
+V 390,50,CONT_DIF_N,*
+V 510,100,CONT_DIF_N,*
+V 510,50,CONT_DIF_N,*
+V 330,100,CONT_DIF_N,*
+V 270,50,CONT_DIF_N,*
+V 270,100,CONT_DIF_N,*
+V 400,150,CONT_POLY,*
+V 90,100,CONT_DIF_N,*
+V 210,100,CONT_DIF_N,*
+V 210,400,CONT_DIF_P,*
+V 210,350,CONT_DIF_P,*
+V 210,300,CONT_DIF_P,*
+V 90,350,CONT_DIF_P,*
+V 90,300,CONT_DIF_P,*
+V 90,400,CONT_DIF_P,*
+V 30,450,CONT_DIF_P,*
+V 30,100,CONT_DIF_N,*
+V 30,50,CONT_DIF_N,*
+V 30,300,CONT_DIF_P,*
+V 30,350,CONT_DIF_P,*
+V 30,400,CONT_DIF_P,*
+V 150,450,CONT_DIF_P,*
+V 150,50,CONT_DIF_N,*
 EOF
diff --git a/alliance/share/cells/rflib/rf_dec_bufad2r.ap b/alliance/share/cells/rflib/rf_dec_bufad2r.ap
deleted file mode 100644
index 92ac043e..00000000
--- a/alliance/share/cells/rflib/rf_dec_bufad2r.ap
+++ /dev/null
@@ -1,139 +0,0 @@
-V ALLIANCE : 6
-H rf_dec_bufad2r,P,10/11/2000,10
-A 0,0,500,500
-S 50,500,150,500,20,*,RIGHT,TALU2
-S 450,200,450,200,20,q1,LEFT,CALU3
-S 350,200,350,200,20,nq1,LEFT,CALU3
-S 300,200,300,200,20,nq0,LEFT,CALU3
-S 200,200,200,200,20,q0,LEFT,CALU3
-S 0,470,500,470,60,vdd,RIGHT,CALU1
-S 0,30,500,30,60,vss,RIGHT,CALU1
-S 150,280,150,470,30,*,DOWN,PDIF
-S 30,280,30,470,30,*,DOWN,PDIF
-S 30,50,30,100,20,*,DOWN,ALU1
-S 30,300,30,450,20,*,UP,ALU1
-S 180,260,180,490,10,*,UP,PTRANS
-S 210,280,210,470,30,*,DOWN,PDIF
-S 120,260,120,490,10,*,UP,PTRANS
-S 60,260,60,490,10,*,UP,PTRANS
-S 90,280,90,470,30,*,DOWN,PDIF
-S 180,10,180,140,10,*,DOWN,NTRANS
-S 240,10,240,140,10,*,DOWN,NTRANS
-S 60,10,60,140,10,*,DOWN,NTRANS
-S 120,10,120,140,10,*,DOWN,NTRANS
-S 150,30,150,120,30,*,UP,NDIF
-S 210,30,210,120,30,*,UP,NDIF
-S 30,30,30,120,30,*,UP,NDIF
-S 90,30,90,120,30,*,UP,NDIF
-S 240,260,240,490,10,*,UP,PTRANS
-S 180,140,180,260,10,*,UP,POLY
-S 240,140,240,260,10,*,UP,POLY
-S 0,390,500,390,240,*,LEFT,NWELL
-S 270,300,270,450,20,*,UP,ALU1
-S 270,50,270,100,20,*,DOWN,ALU1
-S 450,100,450,400,20,*,DOWN,ALU1
-S 510,50,510,100,20,*,DOWN,ALU1
-S 510,300,510,450,20,*,UP,ALU1
-S 300,140,300,260,10,*,UP,POLY
-S 360,140,360,260,10,*,UP,POLY
-S 400,150,480,150,30,*,RIGHT,POLY
-S 390,30,390,120,30,*,UP,NDIF
-S 450,30,450,120,30,*,UP,NDIF
-S 510,30,510,120,30,*,UP,NDIF
-S 270,30,270,120,30,*,UP,NDIF
-S 330,30,330,120,30,*,UP,NDIF
-S 300,10,300,140,10,*,DOWN,NTRANS
-S 360,10,360,140,10,*,DOWN,NTRANS
-S 420,10,420,140,10,*,DOWN,NTRANS
-S 480,10,480,140,10,*,DOWN,NTRANS
-S 360,260,360,490,10,*,UP,PTRANS
-S 270,280,270,470,30,*,DOWN,PDIF
-S 300,260,300,490,10,*,UP,PTRANS
-S 450,280,450,470,30,*,DOWN,PDIF
-S 480,260,480,490,10,*,UP,PTRANS
-S 390,280,390,470,30,*,DOWN,PDIF
-S 420,260,420,490,10,*,UP,PTRANS
-S 510,280,510,470,30,*,DOWN,PDIF
-S 330,280,330,470,30,*,DOWN,PDIF
-S 400,200,400,200,20,i1,LEFT,CALU3
-S 400,250,480,250,30,*,RIGHT,POLY
-S 300,200,400,200,30,*,RIGHT,POLY
-S 350,100,350,400,20,*,UP,ALU1
-S 330,400,350,400,20,*,RIGHT,ALU1
-S 330,350,350,350,20,*,RIGHT,ALU1
-S 330,300,350,300,20,*,RIGHT,ALU1
-S 330,100,350,100,20,*,RIGHT,ALU1
-S 350,250,400,250,20,*,RIGHT,ALU1
-S 350,150,400,150,20,*,RIGHT,ALU1
-S 300,150,300,250,20,*,DOWN,ALU1
-S 210,100,210,150,20,*,DOWN,ALU1
-S 210,250,210,400,20,*,UP,ALU1
-S 250,200,250,200,20,i0,LEFT,CALU3
-S 90,100,90,400,20,*,DOWN,ALU1
-S 60,250,140,250,30,*,RIGHT,POLY
-S 60,150,140,150,30,*,RIGHT,POLY
-S 140,250,300,250,20,*,RIGHT,ALU1
-S 140,150,300,150,20,*,LEFT,ALU1
-S 180,200,250,200,30,*,RIGHT,POLY
-S 90,200,200,200,20,*,RIGHT,ALU1
-S 200,200,450,200,20,*,LEFT,TALU2
-S 100,0,100,500,120,vdd,UP,CALU3
-V 150,50,CONT_DIF_N,*
-V 150,450,CONT_DIF_P,*
-V 30,400,CONT_DIF_P,*
-V 30,350,CONT_DIF_P,*
-V 30,300,CONT_DIF_P,*
-V 30,50,CONT_DIF_N,*
-V 30,100,CONT_DIF_N,*
-V 30,450,CONT_DIF_P,*
-V 90,400,CONT_DIF_P,*
-V 90,300,CONT_DIF_P,*
-V 90,350,CONT_DIF_P,*
-V 210,300,CONT_DIF_P,*
-V 210,350,CONT_DIF_P,*
-V 210,400,CONT_DIF_P,*
-V 210,100,CONT_DIF_N,*
-V 90,100,CONT_DIF_N,*
-V 400,150,CONT_POLY,*
-V 270,100,CONT_DIF_N,*
-V 270,50,CONT_DIF_N,*
-V 330,100,CONT_DIF_N,*
-V 510,50,CONT_DIF_N,*
-V 510,100,CONT_DIF_N,*
-V 390,50,CONT_DIF_N,*
-V 450,100,CONT_DIF_N,*
-V 510,400,CONT_DIF_P,*
-V 510,450,CONT_DIF_P,*
-V 390,450,CONT_DIF_P,*
-V 450,300,CONT_DIF_P,*
-V 450,350,CONT_DIF_P,*
-V 450,400,CONT_DIF_P,*
-V 270,400,CONT_DIF_P,*
-V 330,300,CONT_DIF_P,*
-V 330,350,CONT_DIF_P,*
-V 330,400,CONT_DIF_P,*
-V 270,300,CONT_DIF_P,*
-V 270,350,CONT_DIF_P,*
-V 510,350,CONT_DIF_P,*
-V 510,300,CONT_DIF_P,*
-V 270,450,CONT_DIF_P,*
-V 350,200,CONT_VIA2,*
-V 450,200,CONT_VIA2,*
-V 400,200,CONT_VIA2,*
-V 350,200,CONT_VIA,*
-V 450,200,CONT_VIA,*
-V 400,200,CONT_VIA,*
-V 200,200,CONT_VIA,*
-V 250,200,CONT_VIA,*
-V 300,200,CONT_VIA,*
-V 400,250,CONT_POLY,*
-V 400,200,CONT_POLY,*
-V 250,200,CONT_POLY,*
-V 250,200,CONT_VIA2,*
-V 300,200,CONT_VIA2,*
-V 200,200,CONT_VIA2,*
-V 140,250,CONT_POLY,*
-V 140,150,CONT_POLY,*
-B 100,500,120,20,CONT_VIA2,*
-B 100,500,120,20,CONT_VIA,*
-EOF
diff --git a/alliance/share/cells/rflib/rf_dec_bufad2r.vbe b/alliance/share/cells/rflib/rf_dec_bufad2r.vbe
deleted file mode 100644
index 89f5751b..00000000
--- a/alliance/share/cells/rflib/rf_dec_bufad2r.vbe
+++ /dev/null
@@ -1,26 +0,0 @@
-ENTITY rf_dec_bufad2r IS
-PORT (
-  i0     : in  BIT;
-  i1     : in  BIT;
-  nq0  	 : inout BIT;
-  q0   	 : out BIT;
-  nq1  	 : inout BIT;
-  q1   	 : out BIT;
-  vdd	 : in  BIT;
-  vss	 : in  BIT
-);
-END rf_dec_bufad2r;
-
-ARCHITECTURE VBE OF rf_dec_bufad2r IS
-
-BEGIN
-  ASSERT (vdd and not (vss))
-  REPORT "power supply is missing on rf_dec_bufad2r"
-  SEVERITY WARNING;
-
-  nq0 <= not i0;
-  q0  <= not nq0;
-  nq1 <= not i1;
-  q1  <= not nq1;
-
-END;
diff --git a/alliance/share/cells/rflib/rf_dec_nbuf.ap b/alliance/share/cells/rflib/rf_dec_nbuf.ap
index 89fb8b99..972ec4ca 100644
--- a/alliance/share/cells/rflib/rf_dec_nbuf.ap
+++ b/alliance/share/cells/rflib/rf_dec_nbuf.ap
@@ -1,83 +1,79 @@
 V ALLIANCE : 6
-H rf_dec_nbuf,P,10/11/2000,10
+H rf_dec_nbuf,P,15/ 3/2001,10
 A 0,0,550,500
-S 400,500,500,500,20,*,RIGHT,TALU2
-S 100,100,200,100,20,nq,RIGHT,CALU2
-S 60,200,500,200,30,*,RIGHT,POLY
-S 500,100,500,400,10,i,UP,CALU1
-S 150,300,150,450,20,*,DOWN,ALU1
-S 270,280,270,470,30,*,DOWN,PDIF
-S 270,30,270,120,30,*,UP,NDIF
-S 270,50,270,100,20,*,DOWN,ALU1
-S 270,300,270,450,20,*,UP,ALU1
-S 210,100,210,400,20,*,DOWN,ALU1
-S 240,140,240,260,10,*,UP,POLY
-S 180,140,180,260,10,*,UP,POLY
-S 120,140,120,260,10,*,UP,POLY
-S 60,140,60,260,10,*,UP,POLY
-S 240,260,240,490,10,*,UP,PTRANS
-S 90,30,90,120,30,*,UP,NDIF
-S 30,30,30,120,30,*,UP,NDIF
-S 210,30,210,120,30,*,UP,NDIF
-S 150,30,150,120,30,*,UP,NDIF
-S 120,10,120,140,10,*,DOWN,NTRANS
-S 60,10,60,140,10,*,DOWN,NTRANS
-S 240,10,240,140,10,*,DOWN,NTRANS
-S 180,10,180,140,10,*,DOWN,NTRANS
-S 90,280,90,470,30,*,DOWN,PDIF
-S 60,260,60,490,10,*,UP,PTRANS
-S 120,260,120,490,10,*,UP,PTRANS
-S 210,280,210,470,30,*,DOWN,PDIF
-S 180,260,180,490,10,*,UP,PTRANS
-S 30,300,30,450,20,*,UP,ALU1
-S 30,50,30,100,20,*,DOWN,ALU1
-S 30,280,30,470,30,*,DOWN,PDIF
-S 150,280,150,470,30,*,DOWN,PDIF
-S 340,30,340,150,20,*,DOWN,ALU1
-S 340,300,340,470,20,*,UP,ALU1
-S 340,290,340,480,30,*,UP,NTIE
-S 340,20,340,160,30,*,DOWN,PTIE
-S 0,30,550,30,60,vss,RIGHT,CALU1
-S 0,470,550,470,60,vdd,RIGHT,CALU1
-S 0,390,550,390,240,*,LEFT,NWELL
-S 100,250,210,250,20,*,RIGHT,ALU1
 S 90,100,90,400,20,*,DOWN,ALU1
-S 450,0,450,500,120,vdd,UP,CALU3
-V 100,100,CONT_VIA,*
-V 200,100,CONT_VIA,*
-V 500,200,CONT_POLY,*
-V 150,400,CONT_DIF_P,*
-V 150,350,CONT_DIF_P,*
-V 150,300,CONT_DIF_P,*
-V 270,450,CONT_DIF_P,*
-V 270,350,CONT_DIF_P,*
-V 270,300,CONT_DIF_P,*
-V 270,400,CONT_DIF_P,*
-V 270,50,CONT_DIF_N,*
-V 270,100,CONT_DIF_N,*
-V 90,100,CONT_DIF_N,*
-V 210,100,CONT_DIF_N,*
-V 210,400,CONT_DIF_P,*
-V 210,350,CONT_DIF_P,*
-V 210,300,CONT_DIF_P,*
-V 90,350,CONT_DIF_P,*
-V 90,300,CONT_DIF_P,*
-V 90,400,CONT_DIF_P,*
-V 30,450,CONT_DIF_P,*
-V 30,100,CONT_DIF_N,*
-V 30,50,CONT_DIF_N,*
-V 30,300,CONT_DIF_P,*
-V 30,350,CONT_DIF_P,*
-V 30,400,CONT_DIF_P,*
-V 150,450,CONT_DIF_P,*
-V 150,50,CONT_DIF_N,*
-V 340,470,CONT_BODY_N,*
-V 340,400,CONT_BODY_N,*
-V 340,350,CONT_BODY_N,*
-V 340,300,CONT_BODY_N,*
-V 340,100,CONT_BODY_P,*
-V 340,30,CONT_BODY_P,*
+S 100,250,210,250,20,*,RIGHT,ALU1
+S 0,390,550,390,240,*,LEFT,NWELL
+S 0,470,550,470,60,vdd,RIGHT,CALU1
+S 0,30,550,30,60,vss,RIGHT,CALU1
+S 340,20,340,160,30,*,DOWN,PTIE
+S 340,290,340,480,30,*,UP,NTIE
+S 340,300,340,470,20,*,UP,ALU1
+S 340,30,340,150,20,*,DOWN,ALU1
+S 150,280,150,470,30,*,DOWN,PDIF
+S 30,280,30,470,30,*,DOWN,PDIF
+S 30,50,30,100,20,*,DOWN,ALU1
+S 30,300,30,450,20,*,UP,ALU1
+S 180,260,180,490,10,*,UP,PTRANS
+S 210,280,210,470,30,*,DOWN,PDIF
+S 120,260,120,490,10,*,UP,PTRANS
+S 60,260,60,490,10,*,UP,PTRANS
+S 90,280,90,470,30,*,DOWN,PDIF
+S 180,10,180,140,10,*,DOWN,NTRANS
+S 240,10,240,140,10,*,DOWN,NTRANS
+S 60,10,60,140,10,*,DOWN,NTRANS
+S 120,10,120,140,10,*,DOWN,NTRANS
+S 150,30,150,120,30,*,UP,NDIF
+S 210,30,210,120,30,*,UP,NDIF
+S 30,30,30,120,30,*,UP,NDIF
+S 90,30,90,120,30,*,UP,NDIF
+S 240,260,240,490,10,*,UP,PTRANS
+S 60,140,60,260,10,*,UP,POLY
+S 120,140,120,260,10,*,UP,POLY
+S 180,140,180,260,10,*,UP,POLY
+S 240,140,240,260,10,*,UP,POLY
+S 210,100,210,400,20,*,DOWN,ALU1
+S 270,300,270,450,20,*,UP,ALU1
+S 270,50,270,100,20,*,DOWN,ALU1
+S 270,30,270,120,30,*,UP,NDIF
+S 270,280,270,470,30,*,DOWN,PDIF
+S 150,300,150,450,20,*,DOWN,ALU1
+S 500,100,500,400,10,i,UP,CALU1
+S 60,200,500,200,30,*,RIGHT,POLY
+S 100,100,200,100,20,nq,RIGHT,CALU2
 V 340,150,CONT_BODY_P,*
-B 450,500,120,20,CONT_VIA,*
-B 450,500,120,20,CONT_VIA2,*
+V 340,30,CONT_BODY_P,*
+V 340,100,CONT_BODY_P,*
+V 340,300,CONT_BODY_N,*
+V 340,350,CONT_BODY_N,*
+V 340,400,CONT_BODY_N,*
+V 340,470,CONT_BODY_N,*
+V 150,50,CONT_DIF_N,*
+V 150,450,CONT_DIF_P,*
+V 30,400,CONT_DIF_P,*
+V 30,350,CONT_DIF_P,*
+V 30,300,CONT_DIF_P,*
+V 30,50,CONT_DIF_N,*
+V 30,100,CONT_DIF_N,*
+V 30,450,CONT_DIF_P,*
+V 90,400,CONT_DIF_P,*
+V 90,300,CONT_DIF_P,*
+V 90,350,CONT_DIF_P,*
+V 210,300,CONT_DIF_P,*
+V 210,350,CONT_DIF_P,*
+V 210,400,CONT_DIF_P,*
+V 210,100,CONT_DIF_N,*
+V 90,100,CONT_DIF_N,*
+V 270,100,CONT_DIF_N,*
+V 270,50,CONT_DIF_N,*
+V 270,400,CONT_DIF_P,*
+V 270,300,CONT_DIF_P,*
+V 270,350,CONT_DIF_P,*
+V 270,450,CONT_DIF_P,*
+V 150,300,CONT_DIF_P,*
+V 150,350,CONT_DIF_P,*
+V 150,400,CONT_DIF_P,*
+V 500,200,CONT_POLY,*
+V 200,100,CONT_VIA,*
+V 100,100,CONT_VIA,*
 EOF