diff --git a/alliance/share/cells/dp_sxlib/dp_dff_scan_x4.ap b/alliance/share/cells/dp_sxlib/dp_dff_scan_x4.ap
index f4c4a6bf..84f25c1b 100644
--- a/alliance/share/cells/dp_sxlib/dp_dff_scan_x4.ap
+++ b/alliance/share/cells/dp_sxlib/dp_dff_scan_x4.ap
@@ -1,235 +1,235 @@
 V ALLIANCE : 6
-H dp_dff_scan_x4,P,26/ 9/2000,100
+H dp_dff_scan_x4,P,10/10/2000,100
 A 0,0,10000,5000
-R 6000,2000,ref_ref,nckx
-R 7500,2000,ref_ref,ckx
-R 5000,2000,ref_ref,scanx
-R 4000,2000,ref_ref,nscanx
-R 2500,2000,ref_ref,nwenx
-R 1500,2000,ref_ref,wenx
-R 1000,3000,ref_ref,i_30
-R 1000,2500,ref_ref,i_25
-R 1000,2000,ref_ref,i_20
-R 1000,1500,ref_ref,i_15
-R 1000,1000,ref_ref,i_10
-R 1000,4000,ref_ref,i_40
-R 1000,3500,ref_ref,i_35
-R 9000,3500,ref_ref,q_35
-R 9000,2000,ref_ref,q_20
-R 9000,3000,ref_ref,q_30
-R 9000,4000,ref_ref,q_40
-R 9000,1000,ref_ref,q_10
-R 9000,1500,ref_ref,q_15
 R 9000,2500,ref_ref,q_25
-S 6000,2000,7500,2000,200,*,RIGHT,TALU2
-S 6000,1500,6400,1500,200,*,RIGHT,ALU1
-S 6000,3000,6900,3000,100,*,RIGHT,ALU1
-S 6000,1500,6000,3000,100,*,DOWN,ALU1
-S 6000,2000,6000,2000,200,nckx,LEFT,CALU3
-S 7400,2500,7400,3500,100,*,DOWN,ALU1
-S 6700,3500,6700,4000,100,*,DOWN,ALU1
-S 6700,3500,7400,3500,100,*,RIGHT,ALU1
-S 1500,2000,5000,2000,200,*,RIGHT,TALU2
-S 5700,500,5700,1000,200,*,UP,ALU1
-S 1600,4000,2600,4000,100,*,LEFT,ALU1
-S 2600,1500,2600,4000,100,*,UP,ALU1
-S 3100,1500,3100,3000,100,*,UP,ALU1
-S 0,4000,10000,4000,2600,*,RIGHT,NWELL
-S 2200,300,2200,1100,300,*,DOWN,NDIF
-S 2100,1000,2100,3500,100,*,UP,ALU1
-S 3300,500,3300,1000,200,*,DOWN,ALU1
-S 3000,900,3000,1500,100,*,DOWN,POLY
-S 2500,900,2500,1500,100,*,DOWN,POLY
-S 600,900,600,1400,100,*,DOWN,POLY
-S 600,1400,2100,1400,100,*,LEFT,POLY
-S 600,2900,600,3400,100,*,DOWN,POLY
-S 900,1000,1200,1000,300,*,RIGHT,POLY
-S 2000,300,2000,1100,300,*,DOWN,NDIF
-S 3300,300,3300,1200,300,*,DOWN,NDIF
-S 900,300,900,700,300,*,DOWN,NDIF
-S 300,300,300,1100,300,*,DOWN,NDIF
-S 600,100,600,900,100,*,DOWN,NTRANS
-S 2500,100,2500,900,100,*,DOWN,NTRANS
-S 1200,100,1200,900,100,*,DOWN,NTRANS
-S 1700,100,1700,900,100,*,DOWN,NTRANS
-S 3000,100,3000,900,100,*,DOWN,NTRANS
-S 300,2000,3600,2000,100,*,LEFT,POLY
-S 1500,2500,2500,2500,100,*,RIGHT,POLY
-S 600,3400,600,4700,100,*,UP,PTRANS
-S 300,3600,300,4500,300,*,UP,PDIF
-S 900,3600,900,4500,300,*,UP,PDIF
-S 1700,3400,1700,4700,100,*,UP,PTRANS
-S 1200,3400,1200,4700,100,*,UP,PTRANS
-S 9600,2800,9600,4700,300,*,DOWN,PDIF
-S 9300,2600,9300,4900,100,*,DOWN,PTRANS
-S 8100,2600,8100,4900,100,*,DOWN,PTRANS
-S 7400,2800,7400,4700,300,*,DOWN,PDIF
-S 8300,2800,8300,4700,300,*,DOWN,PDIF
-S 7700,2600,7700,4900,100,*,DOWN,PTRANS
-S 9000,2800,9000,4700,300,*,DOWN,PDIF
-S 8700,2600,8700,4900,100,*,DOWN,PTRANS
-S 3300,400,3300,1200,300,*,DOWN,NDIF
-S 7400,300,7400,1200,300,*,DOWN,NDIF
-S 9300,100,9300,1400,100,*,UP,NTRANS
-S 9000,300,9000,1200,300,*,DOWN,NDIF
-S 8400,300,8400,1200,300,*,DOWN,NDIF
-S 7700,100,7700,1400,100,*,UP,NTRANS
-S 8100,100,8100,1400,100,*,UP,NTRANS
-S 8700,100,8700,1400,100,*,UP,NTRANS
-S 9600,300,9600,1200,300,*,DOWN,NDIF
-S 3600,600,3600,1400,100,*,DOWN,NTRANS
-S 6000,600,6000,1400,100,*,UP,NTRANS
-S 5700,400,5700,1200,300,*,DOWN,NDIF
-S 6400,600,6400,1400,100,*,UP,NTRANS
-S 6700,800,6700,1200,300,*,DOWN,NDIF
-S 4500,800,4500,1200,500,*,UP,NDIF
-S 4100,600,4100,1400,100,*,DOWN,NTRANS
-S 5400,600,5400,1400,100,*,DOWN,NTRANS
-S 4900,600,4900,1400,100,*,DOWN,NTRANS
-S 600,2900,2100,2900,100,*,RIGHT,POLY
-S 900,3300,1200,3300,300,*,RIGHT,POLY
-S 2500,2500,2500,3500,100,*,UP,POLY
-S 6900,2500,7700,2500,100,*,LEFT,POLY
-S 7300,1400,7700,1400,100,*,LEFT,POLY
-S 9300,1400,9300,2600,100,*,DOWN,POLY
-S 8500,2000,9300,2000,100,*,RIGHT,POLY
-S 8100,1400,8100,2600,100,*,DOWN,POLY
-S 7700,2500,7700,2600,100,*,DOWN,POLY
-S 8700,1400,8700,2600,100,*,DOWN,POLY
-S 4100,2500,4900,2500,100,*,RIGHT,POLY
-S 4100,1400,4100,2500,100,*,UP,POLY
-S 4500,2000,6000,2000,100,*,RIGHT,POLY
-S 300,1000,300,4000,100,*,DOWN,ALU1
-S 1600,3300,1600,4000,100,*,DOWN,ALU1
-S 6700,1000,6900,1000,200,*,RIGHT,ALU1
-S 7400,4000,7900,4000,100,*,RIGHT,ALU1
-S 9600,3000,9600,4500,200,*,DOWN,ALU1
-S 9600,500,9600,1000,200,*,DOWN,ALU1
-S 4500,1000,4500,3500,100,*,UP,ALU1
-S 5000,1500,5000,4000,100,*,UP,ALU1
-S 4000,4000,5000,4000,100,*,LEFT,ALU1
-S 7900,2500,7900,4000,100,*,DOWN,ALU1
-S 6900,2500,7400,2500,100,*,RIGHT,ALU1
-S 6900,1000,6900,2500,100,*,DOWN,ALU1
-S 6400,2000,7300,2000,100,*,RIGHT,POLY
-S 7300,1400,7300,2000,100,*,DOWN,POLY
-S 6900,2500,6900,3000,100,*,UP,POLY
-S 6900,1500,8000,1500,100,*,RIGHT,ALU1
-S 8000,1500,8000,1900,100,*,UP,ALU1
-S 8500,1000,8500,2500,100,*,DOWN,ALU1
-S 7400,1000,8500,1000,100,*,LEFT,ALU1
-S 7900,2500,8500,2500,100,*,RIGHT,ALU1
-S 8400,3000,8400,4500,200,*,DOWN,ALU1
-S 1500,1000,1500,2500,100,*,UP,ALU1
-S 4100,3100,4100,4400,100,*,UP,PTRANS
-S 4900,3100,4900,4400,100,*,UP,PTRANS
-S 5400,3100,5400,4400,100,*,UP,PTRANS
-S 4500,3300,4500,4200,500,*,UP,PDIF
-S 3600,3100,3600,4400,100,*,UP,PTRANS
-S 3000,3100,3000,4400,100,*,UP,PTRANS
-S 3300,3300,3300,4200,300,*,UP,PDIF
-S 3300,3500,3300,4500,200,*,DOWN,ALU1
-S 3300,3600,3300,4200,300,*,UP,PDIF
-S 2500,3100,2500,4400,100,*,UP,PTRANS
-S 3600,1400,3600,3100,100,*,DOWN,POLY
-S 4900,2500,4900,3100,100,*,DOWN,POLY
-S 2100,3300,2100,4500,500,*,UP,PDIF
-S 5700,3500,5700,4500,200,*,DOWN,ALU1
-S 6400,3600,6400,4900,100,*,DOWN,PTRANS
-S 6000,3600,6000,4900,100,*,DOWN,PTRANS
-S 5700,3300,5700,4700,300,*,UP,PDIF
-S 6700,3800,6700,4700,300,*,DOWN,PDIF
-S 6000,900,6000,3600,100,*,DOWN,POLY
-S 6400,2000,6400,3600,100,*,DOWN,POLY
-S 4000,3000,4000,4000,100,*,DOWN,ALU1
-S 1000,1000,1000,4000,200,i,UP,CALU1
-S 9000,1000,9000,4000,200,q,DOWN,CALU1
-S 0,300,10000,300,600,vss,RIGHT,CALU1
-S 0,4700,10000,4700,600,vdd,RIGHT,CALU1
-S 3100,2500,9000,2500,200,q,RIGHT,CALU2
-S 5500,1500,5500,3000,100,scin,UP,CALU1
-S 1500,2000,1500,2000,200,wenx,LEFT,CALU3
-S 2500,2000,2500,2000,200,nwenx,LEFT,CALU3
-S 4000,2000,4000,2000,200,nscanx,LEFT,CALU3
-S 5000,2000,5000,2000,200,scanx,LEFT,CALU3
+R 9000,1500,ref_ref,q_15
+R 9000,1000,ref_ref,q_10
+R 9000,4000,ref_ref,q_40
+R 9000,3000,ref_ref,q_30
+R 9000,2000,ref_ref,q_20
+R 9000,3500,ref_ref,q_35
+R 1000,3500,ref_ref,i_35
+R 1000,4000,ref_ref,i_40
+R 1000,1000,ref_ref,i_10
+R 1000,1500,ref_ref,i_15
+R 1000,2000,ref_ref,i_20
+R 1000,2500,ref_ref,i_25
+R 1000,3000,ref_ref,i_30
+R 1500,2000,ref_ref,wenx
+R 2500,2000,ref_ref,nwenx
+R 4000,2000,ref_ref,nscanx
+R 5000,2000,ref_ref,scanx
+R 7500,2000,ref_ref,ckx
+R 6000,2000,ref_ref,nckx
+S 3000,2500,9000,2500,200,q,RIGHT,CALU2
 S 7500,2000,7500,2000,200,ckx,LEFT,CALU3
-V 6000,2000,CONT_VIA,*
-V 6000,2000,CONT_VIA2,*
-V 1500,2000,CONT_VIA,*
-V 1500,2000,CONT_VIA2,*
-V 6700,300,CONT_BODY_P,*
-V 5700,1000,CONT_DIF_N,*
-V 5700,4000,CONT_DIF_P,*
-V 3300,4000,CONT_DIF_P,*
-V 2600,1500,CONT_POLY,*
-V 3100,1500,CONT_POLY,*
-V 3100,3000,CONT_POLY,*
-V 3100,2500,CONT_VIA,*
-V 2100,1000,CONT_DIF_N,*
-V 2100,1500,CONT_POLY,*
-V 2100,3500,CONT_DIF_P,*
-V 3300,1000,CONT_DIF_N,*
-V 1600,1000,CONT_POLY,*
-V 1000,1000,CONT_POLY,*
-V 300,2000,CONT_POLY,*
-V 1500,2500,CONT_POLY,*
-V 900,4500,CONT_DIF_P,*
-V 300,4000,CONT_DIF_P,*
-V 8400,3500,CONT_DIF_P,*
-V 9600,3000,CONT_DIF_P,*
-V 9600,4500,CONT_DIF_P,*
-V 8400,4500,CONT_DIF_P,*
-V 8400,4000,CONT_DIF_P,*
-V 9000,3000,CONT_DIF_P,*
-V 9600,4000,CONT_DIF_P,*
-V 9600,3500,CONT_DIF_P,*
-V 7400,4000,CONT_DIF_P,*
-V 5700,4500,CONT_DIF_P,*
-V 4500,3500,CONT_DIF_P,*
-V 900,500,CONT_DIF_N,*
-V 300,1000,CONT_DIF_N,*
-V 3300,500,CONT_DIF_N,*
-V 9600,1000,CONT_DIF_N,*
-V 9600,500,CONT_DIF_N,*
-V 8400,500,CONT_DIF_N,*
-V 9000,1000,CONT_DIF_N,*
-V 7400,1000,CONT_DIF_N,*
-V 5700,500,CONT_DIF_N,*
-V 4500,1000,CONT_DIF_N,*
-V 3300,500,CONT_DIF_N,*
-V 6700,1000,CONT_DIF_N,*
-V 5100,300,CONT_BODY_P,*
-V 3900,300,CONT_BODY_P,*
-V 4500,300,CONT_BODY_P,*
-V 2100,3000,CONT_POLY,*
-V 1000,3300,CONT_POLY,*
-V 1600,3300,CONT_POLY,*
-V 5500,3000,CONT_POLY,*
-V 5500,1500,CONT_POLY,*
-V 5000,1500,CONT_POLY,*
-V 8500,2000,CONT_POLY,*
-V 6400,1500,CONT_POLY,*
-V 4500,2000,CONT_POLY,*
-V 9000,2500,CONT_VIA,*
-V 8000,2000,CONT_POLY,*
-V 6900,3000,CONT_POLY,*
-V 7500,2000,CONT_VIA2,*
-V 7500,2000,CONT_VIA,*
-V 7400,2000,CONT_POLY,*
-V 8400,3000,CONT_DIF_P,*
-V 4000,2000,CONT_VIA2,*
-V 4000,2000,CONT_VIA,*
-V 4000,2000,CONT_POLY,*
-V 5000,2000,CONT_VIA2,*
-V 5000,2000,CONT_VIA,*
-V 2500,2000,CONT_VIA2,*
-V 2600,2000,CONT_VIA,*
-V 4000,3000,CONT_POLY,*
-V 4500,4700,CONT_BODY_N,*
-V 5100,4700,CONT_BODY_N,*
-V 3900,4700,CONT_BODY_N,*
-V 3300,3500,CONT_DIF_P,*
-V 3300,4700,CONT_BODY_N,*
-V 5700,3500,CONT_DIF_P,*
+S 5000,2000,5000,2000,200,scanx,LEFT,CALU3
+S 4000,2000,4000,2000,200,nscanx,LEFT,CALU3
+S 2500,2000,2500,2000,200,nwenx,LEFT,CALU3
+S 1500,2000,1500,2000,200,wenx,LEFT,CALU3
+S 5500,1500,5500,3000,100,scin,UP,CALU1
+S 0,4700,10000,4700,600,vdd,RIGHT,CALU1
+S 0,300,10000,300,600,vss,RIGHT,CALU1
+S 9000,1000,9000,4000,200,q,DOWN,CALU1
+S 1000,1000,1000,4000,200,i,UP,CALU1
+S 4000,3000,4000,4000,100,*,DOWN,ALU1
+S 6400,2000,6400,3600,100,*,DOWN,POLY
+S 6000,900,6000,3600,100,*,DOWN,POLY
+S 6700,3800,6700,4700,300,*,DOWN,PDIF
+S 5700,3300,5700,4700,300,*,UP,PDIF
+S 6000,3600,6000,4900,100,*,DOWN,PTRANS
+S 6400,3600,6400,4900,100,*,DOWN,PTRANS
+S 5700,3500,5700,4500,200,*,DOWN,ALU1
+S 2100,3300,2100,4500,500,*,UP,PDIF
+S 4900,2500,4900,3100,100,*,DOWN,POLY
+S 3600,1400,3600,3100,100,*,DOWN,POLY
+S 2500,3100,2500,4400,100,*,UP,PTRANS
+S 3300,3600,3300,4200,300,*,UP,PDIF
+S 3300,3500,3300,4500,200,*,DOWN,ALU1
+S 3300,3300,3300,4200,300,*,UP,PDIF
+S 3000,3100,3000,4400,100,*,UP,PTRANS
+S 3600,3100,3600,4400,100,*,UP,PTRANS
+S 4500,3300,4500,4200,500,*,UP,PDIF
+S 5400,3100,5400,4400,100,*,UP,PTRANS
+S 4900,3100,4900,4400,100,*,UP,PTRANS
+S 4100,3100,4100,4400,100,*,UP,PTRANS
+S 1500,1000,1500,2500,100,*,UP,ALU1
+S 8400,3000,8400,4500,200,*,DOWN,ALU1
+S 7900,2500,8500,2500,100,*,RIGHT,ALU1
+S 7400,1000,8500,1000,100,*,LEFT,ALU1
+S 8500,1000,8500,2500,100,*,DOWN,ALU1
+S 8000,1500,8000,1900,100,*,UP,ALU1
+S 6900,1500,8000,1500,100,*,RIGHT,ALU1
+S 6900,2500,6900,3000,100,*,UP,POLY
+S 7300,1400,7300,2000,100,*,DOWN,POLY
+S 6400,2000,7300,2000,100,*,RIGHT,POLY
+S 6900,1000,6900,2500,100,*,DOWN,ALU1
+S 6900,2500,7400,2500,100,*,RIGHT,ALU1
+S 7900,2500,7900,4000,100,*,DOWN,ALU1
+S 4000,4000,5000,4000,100,*,LEFT,ALU1
+S 5000,1500,5000,4000,100,*,UP,ALU1
+S 4500,1000,4500,3500,100,*,UP,ALU1
+S 9600,500,9600,1000,200,*,DOWN,ALU1
+S 9600,3000,9600,4500,200,*,DOWN,ALU1
+S 7400,4000,7900,4000,100,*,RIGHT,ALU1
+S 6700,1000,6900,1000,200,*,RIGHT,ALU1
+S 1600,3300,1600,4000,100,*,DOWN,ALU1
+S 300,1000,300,4000,100,*,DOWN,ALU1
+S 4500,2000,6000,2000,100,*,RIGHT,POLY
+S 4100,1400,4100,2500,100,*,UP,POLY
+S 4100,2500,4900,2500,100,*,RIGHT,POLY
+S 8700,1400,8700,2600,100,*,DOWN,POLY
+S 7700,2500,7700,2600,100,*,DOWN,POLY
+S 8100,1400,8100,2600,100,*,DOWN,POLY
+S 8500,2000,9300,2000,100,*,RIGHT,POLY
+S 9300,1400,9300,2600,100,*,DOWN,POLY
+S 7300,1400,7700,1400,100,*,LEFT,POLY
+S 6900,2500,7700,2500,100,*,LEFT,POLY
+S 2500,2500,2500,3500,100,*,UP,POLY
+S 900,3300,1200,3300,300,*,RIGHT,POLY
+S 600,2900,2100,2900,100,*,RIGHT,POLY
+S 4900,600,4900,1400,100,*,DOWN,NTRANS
+S 5400,600,5400,1400,100,*,DOWN,NTRANS
+S 4100,600,4100,1400,100,*,DOWN,NTRANS
+S 4500,800,4500,1200,500,*,UP,NDIF
+S 6700,800,6700,1200,300,*,DOWN,NDIF
+S 6400,600,6400,1400,100,*,UP,NTRANS
+S 5700,400,5700,1200,300,*,DOWN,NDIF
+S 6000,600,6000,1400,100,*,UP,NTRANS
+S 3600,600,3600,1400,100,*,DOWN,NTRANS
+S 9600,300,9600,1200,300,*,DOWN,NDIF
+S 8700,100,8700,1400,100,*,UP,NTRANS
+S 8100,100,8100,1400,100,*,UP,NTRANS
+S 7700,100,7700,1400,100,*,UP,NTRANS
+S 8400,300,8400,1200,300,*,DOWN,NDIF
+S 9000,300,9000,1200,300,*,DOWN,NDIF
+S 9300,100,9300,1400,100,*,UP,NTRANS
+S 7400,300,7400,1200,300,*,DOWN,NDIF
+S 3300,400,3300,1200,300,*,DOWN,NDIF
+S 8700,2600,8700,4900,100,*,DOWN,PTRANS
+S 9000,2800,9000,4700,300,*,DOWN,PDIF
+S 7700,2600,7700,4900,100,*,DOWN,PTRANS
+S 8300,2800,8300,4700,300,*,DOWN,PDIF
+S 7400,2800,7400,4700,300,*,DOWN,PDIF
+S 8100,2600,8100,4900,100,*,DOWN,PTRANS
+S 9300,2600,9300,4900,100,*,DOWN,PTRANS
+S 9600,2800,9600,4700,300,*,DOWN,PDIF
+S 1200,3400,1200,4700,100,*,UP,PTRANS
+S 1700,3400,1700,4700,100,*,UP,PTRANS
+S 900,3600,900,4500,300,*,UP,PDIF
+S 300,3600,300,4500,300,*,UP,PDIF
+S 600,3400,600,4700,100,*,UP,PTRANS
+S 1500,2500,2500,2500,100,*,RIGHT,POLY
+S 300,2000,3600,2000,100,*,LEFT,POLY
+S 3000,100,3000,900,100,*,DOWN,NTRANS
+S 1700,100,1700,900,100,*,DOWN,NTRANS
+S 1200,100,1200,900,100,*,DOWN,NTRANS
+S 2500,100,2500,900,100,*,DOWN,NTRANS
+S 600,100,600,900,100,*,DOWN,NTRANS
+S 300,300,300,1100,300,*,DOWN,NDIF
+S 900,300,900,700,300,*,DOWN,NDIF
+S 3300,300,3300,1200,300,*,DOWN,NDIF
+S 2000,300,2000,1100,300,*,DOWN,NDIF
+S 900,1000,1200,1000,300,*,RIGHT,POLY
+S 600,2900,600,3400,100,*,DOWN,POLY
+S 600,1400,2100,1400,100,*,LEFT,POLY
+S 600,900,600,1400,100,*,DOWN,POLY
+S 2500,900,2500,1500,100,*,DOWN,POLY
+S 3000,900,3000,1500,100,*,DOWN,POLY
+S 3300,500,3300,1000,200,*,DOWN,ALU1
+S 2100,1000,2100,3500,100,*,UP,ALU1
+S 2200,300,2200,1100,300,*,DOWN,NDIF
+S 0,4000,10000,4000,2600,*,RIGHT,NWELL
+S 3100,1500,3100,3000,100,*,UP,ALU1
+S 2600,1500,2600,4000,100,*,UP,ALU1
+S 1600,4000,2600,4000,100,*,LEFT,ALU1
+S 5700,500,5700,1000,200,*,UP,ALU1
+S 1500,2000,5000,2000,200,*,RIGHT,TALU2
+S 6700,3500,7400,3500,100,*,RIGHT,ALU1
+S 6700,3500,6700,4000,100,*,DOWN,ALU1
+S 7400,2500,7400,3500,100,*,DOWN,ALU1
+S 6000,2000,6000,2000,200,nckx,LEFT,CALU3
+S 6000,1500,6000,3000,100,*,DOWN,ALU1
+S 6000,3000,6900,3000,100,*,RIGHT,ALU1
+S 6000,1500,6400,1500,200,*,RIGHT,ALU1
+S 6000,2000,7500,2000,200,*,RIGHT,TALU2
 V 6700,4000,CONT_DIF_P,*
+V 5700,3500,CONT_DIF_P,*
+V 3300,4700,CONT_BODY_N,*
+V 3300,3500,CONT_DIF_P,*
+V 3900,4700,CONT_BODY_N,*
+V 5100,4700,CONT_BODY_N,*
+V 4500,4700,CONT_BODY_N,*
+V 4000,3000,CONT_POLY,*
+V 2600,2000,CONT_VIA,*
+V 2500,2000,CONT_VIA2,*
+V 5000,2000,CONT_VIA,*
+V 5000,2000,CONT_VIA2,*
+V 4000,2000,CONT_POLY,*
+V 4000,2000,CONT_VIA,*
+V 4000,2000,CONT_VIA2,*
+V 8400,3000,CONT_DIF_P,*
+V 7400,2000,CONT_POLY,*
+V 7500,2000,CONT_VIA,*
+V 7500,2000,CONT_VIA2,*
+V 6900,3000,CONT_POLY,*
+V 8000,2000,CONT_POLY,*
+V 9000,2500,CONT_VIA,*
+V 4500,2000,CONT_POLY,*
+V 6400,1500,CONT_POLY,*
+V 8500,2000,CONT_POLY,*
+V 5000,1500,CONT_POLY,*
+V 5500,1500,CONT_POLY,*
+V 5500,3000,CONT_POLY,*
+V 1600,3300,CONT_POLY,*
+V 1000,3300,CONT_POLY,*
+V 2100,3000,CONT_POLY,*
+V 4500,300,CONT_BODY_P,*
+V 3900,300,CONT_BODY_P,*
+V 5100,300,CONT_BODY_P,*
+V 6700,1000,CONT_DIF_N,*
+V 3300,500,CONT_DIF_N,*
+V 4500,1000,CONT_DIF_N,*
+V 5700,500,CONT_DIF_N,*
+V 7400,1000,CONT_DIF_N,*
+V 9000,1000,CONT_DIF_N,*
+V 8400,500,CONT_DIF_N,*
+V 9600,500,CONT_DIF_N,*
+V 9600,1000,CONT_DIF_N,*
+V 3300,500,CONT_DIF_N,*
+V 300,1000,CONT_DIF_N,*
+V 900,500,CONT_DIF_N,*
+V 4500,3500,CONT_DIF_P,*
+V 5700,4500,CONT_DIF_P,*
+V 7400,4000,CONT_DIF_P,*
+V 9600,3500,CONT_DIF_P,*
+V 9600,4000,CONT_DIF_P,*
+V 9000,3000,CONT_DIF_P,*
+V 8400,4000,CONT_DIF_P,*
+V 8400,4500,CONT_DIF_P,*
+V 9600,4500,CONT_DIF_P,*
+V 9600,3000,CONT_DIF_P,*
+V 8400,3500,CONT_DIF_P,*
+V 300,4000,CONT_DIF_P,*
+V 900,4500,CONT_DIF_P,*
+V 1500,2500,CONT_POLY,*
+V 300,2000,CONT_POLY,*
+V 1000,1000,CONT_POLY,*
+V 1600,1000,CONT_POLY,*
+V 3300,1000,CONT_DIF_N,*
+V 2100,3500,CONT_DIF_P,*
+V 2100,1500,CONT_POLY,*
+V 2100,1000,CONT_DIF_N,*
+V 3100,2500,CONT_VIA,*
+V 3100,3000,CONT_POLY,*
+V 3100,1500,CONT_POLY,*
+V 2600,1500,CONT_POLY,*
+V 3300,4000,CONT_DIF_P,*
+V 5700,4000,CONT_DIF_P,*
+V 5700,1000,CONT_DIF_N,*
+V 6700,300,CONT_BODY_P,*
+V 1500,2000,CONT_VIA2,*
+V 1500,2000,CONT_VIA,*
+V 6000,2000,CONT_VIA2,*
+V 6000,2000,CONT_VIA,*
 EOF
diff --git a/alliance/share/cells/dp_sxlib/dp_sxlib.lef b/alliance/share/cells/dp_sxlib/dp_sxlib.lef
index f8803066..dbf5f593 100644
--- a/alliance/share/cells/dp_sxlib/dp_sxlib.lef
+++ b/alliance/share/cells/dp_sxlib/dp_sxlib.lef
@@ -8,6 +8,14 @@ MACRO dp_dff_scan_x4
     PIN q
         DIRECTION INOUT ;
         PORT
+            LAYER L_ALU1 ;
+            RECT 89.00 39.00 91.00 41.00 ;
+            RECT 89.00 34.00 91.00 36.00 ;
+            RECT 89.00 29.00 91.00 31.00 ;
+            RECT 89.00 24.00 91.00 26.00 ;
+            RECT 89.00 19.00 91.00 21.00 ;
+            RECT 89.00 14.00 91.00 16.00 ;
+            RECT 89.00 9.00 91.00 11.00 ;
             LAYER L_ALU2 ;
             RECT 89.00 24.00 91.00 26.00 ;
             RECT 84.00 24.00 86.00 26.00 ;
@@ -21,23 +29,54 @@ MACRO dp_dff_scan_x4
             RECT 44.00 24.00 46.00 26.00 ;
             RECT 39.00 24.00 41.00 26.00 ;
             RECT 34.00 24.00 36.00 26.00 ;
-            LAYER L_ALU1 ;
-            RECT 89.00 39.00 91.00 41.00 ;
-            RECT 89.00 34.00 91.00 36.00 ;
-            RECT 89.00 29.00 91.00 31.00 ;
-            RECT 89.00 24.00 91.00 26.00 ;
-            RECT 89.00 19.00 91.00 21.00 ;
-            RECT 89.00 14.00 91.00 16.00 ;
-            RECT 89.00 9.00 91.00 11.00 ;
+            RECT 29.00 24.00 31.00 26.00 ;
         END
     END q
-    PIN nckx
+    PIN ckx
         DIRECTION INPUT ;
         PORT
             LAYER L_ALU3 ;
-            RECT 59.00 19.00 61.00 21.00 ;
+            RECT 74.00 19.00 76.00 21.00 ;
         END
-    END nckx
+    END ckx
+    PIN scanx
+        DIRECTION INPUT ;
+        PORT
+            LAYER L_ALU3 ;
+            RECT 49.00 19.00 51.00 21.00 ;
+        END
+    END scanx
+    PIN nscanx
+        DIRECTION INPUT ;
+        PORT
+            LAYER L_ALU3 ;
+            RECT 39.00 19.00 41.00 21.00 ;
+        END
+    END nscanx
+    PIN nwenx
+        DIRECTION INPUT ;
+        PORT
+            LAYER L_ALU3 ;
+            RECT 24.00 19.00 26.00 21.00 ;
+        END
+    END nwenx
+    PIN wenx
+        DIRECTION INPUT ;
+        PORT
+            LAYER L_ALU3 ;
+            RECT 14.00 19.00 16.00 21.00 ;
+        END
+    END wenx
+    PIN scin
+        DIRECTION INPUT ;
+        PORT
+            LAYER L_ALU1 ;
+            RECT 54.00 29.00 56.00 31.00 ;
+            RECT 54.00 24.00 56.00 26.00 ;
+            RECT 54.00 19.00 56.00 21.00 ;
+            RECT 54.00 14.00 56.00 16.00 ;
+        END
+    END scin
     PIN i
         DIRECTION INPUT ;
         PORT
@@ -51,51 +90,13 @@ MACRO dp_dff_scan_x4
             RECT 9.00 9.00 11.00 11.00 ;
         END
     END i
-    PIN scin
-        DIRECTION INPUT ;
-        PORT
-            LAYER L_ALU1 ;
-            RECT 54.00 29.00 56.00 31.00 ;
-            RECT 54.00 24.00 56.00 26.00 ;
-            RECT 54.00 19.00 56.00 21.00 ;
-            RECT 54.00 14.00 56.00 16.00 ;
-        END
-    END scin
-    PIN wenx
+    PIN nckx
         DIRECTION INPUT ;
         PORT
             LAYER L_ALU3 ;
-            RECT 14.00 19.00 16.00 21.00 ;
+            RECT 59.00 19.00 61.00 21.00 ;
         END
-    END wenx
-    PIN nwenx
-        DIRECTION INPUT ;
-        PORT
-            LAYER L_ALU3 ;
-            RECT 24.00 19.00 26.00 21.00 ;
-        END
-    END nwenx
-    PIN nscanx
-        DIRECTION INPUT ;
-        PORT
-            LAYER L_ALU3 ;
-            RECT 39.00 19.00 41.00 21.00 ;
-        END
-    END nscanx
-    PIN scanx
-        DIRECTION INPUT ;
-        PORT
-            LAYER L_ALU3 ;
-            RECT 49.00 19.00 51.00 21.00 ;
-        END
-    END scanx
-    PIN ckx
-        DIRECTION INPUT ;
-        PORT
-            LAYER L_ALU3 ;
-            RECT 74.00 19.00 76.00 21.00 ;
-        END
-    END ckx
+    END nckx
     PIN vdd
         DIRECTION INOUT ;
         USE power ;
@@ -252,8 +253,8 @@ MACRO dp_dff_scan_x4
         RECT 89.00 39.00 91.00 41.00 ;
         RECT 94.00 39.00 98.50 41.00 ;
         LAYER L_ALU2 ;
-        RECT 14.00 19.00 51.00 21.00 ;
         RECT 59.00 19.00 76.00 21.00 ;
+        RECT 14.00 19.00 51.00 21.00 ;
     END
 END dp_dff_scan_x4