diff --git a/alliance/share/cells/sxlib/a2_x2.vbe b/alliance/share/cells/sxlib/a2_x2.vbe
index 14007e2b..70119d32 100644
--- a/alliance/share/cells/sxlib/a2_x2.vbe
+++ b/alliance/share/cells/sxlib/a2_x2.vbe
@@ -25,5 +25,6 @@ END a2_x2;
 ARCHITECTURE behaviour_data_flow OF a2_x2 IS
 
 BEGIN
-  q <= (i0 and i1) after 1040 ps;
+1040
+q <= (i0 and i1) after 1000 ps;
 END;
diff --git a/alliance/share/cells/sxlib/a2_x4.vbe b/alliance/share/cells/sxlib/a2_x4.vbe
index 8290e105..e95dbddc 100644
--- a/alliance/share/cells/sxlib/a2_x4.vbe
+++ b/alliance/share/cells/sxlib/a2_x4.vbe
@@ -25,5 +25,6 @@ END a2_x4;
 ARCHITECTURE behaviour_data_flow OF a2_x4 IS
 
 BEGIN
-  q <= (i0 and i1) after 1121 ps;
+1121
+q <= (i0 and i1) after 1100 ps;
 END;
diff --git a/alliance/share/cells/sxlib/a3_x2.vbe b/alliance/share/cells/sxlib/a3_x2.vbe
index 1bb1d5e1..ff2d745a 100644
--- a/alliance/share/cells/sxlib/a3_x2.vbe
+++ b/alliance/share/cells/sxlib/a3_x2.vbe
@@ -31,5 +31,6 @@ END a3_x2;
 ARCHITECTURE behaviour_data_flow OF a3_x2 IS
 
 BEGIN
-  q <= ((i0 and i1) and i2) after 1125 ps;
+1125
+q <= ((i0 and i1) and i2) after 1100 ps;
 END;
diff --git a/alliance/share/cells/sxlib/a3_x4.vbe b/alliance/share/cells/sxlib/a3_x4.vbe
index 40100ce9..286d06fa 100644
--- a/alliance/share/cells/sxlib/a3_x4.vbe
+++ b/alliance/share/cells/sxlib/a3_x4.vbe
@@ -31,5 +31,6 @@ END a3_x4;
 ARCHITECTURE behaviour_data_flow OF a3_x4 IS
 
 BEGIN
-  q <= ((i0 and i1) and i2) after 1196 ps;
+1196
+q <= ((i0 and i1) and i2) after 1200 ps;
 END;
diff --git a/alliance/share/cells/sxlib/a4_x2.vbe b/alliance/share/cells/sxlib/a4_x2.vbe
index 1a0150c4..66c7c897 100644
--- a/alliance/share/cells/sxlib/a4_x2.vbe
+++ b/alliance/share/cells/sxlib/a4_x2.vbe
@@ -37,5 +37,6 @@ END a4_x2;
 ARCHITECTURE behaviour_data_flow OF a4_x2 IS
 
 BEGIN
-  q <= (((i0 and i1) and i2) and i3) after 1182 ps;
+1182
+q <= (((i0 and i1) and i2) and i3) after 1200 ps;
 END;
diff --git a/alliance/share/cells/sxlib/a4_x4.vbe b/alliance/share/cells/sxlib/a4_x4.vbe
index 97e5b6d3..3b84a047 100644
--- a/alliance/share/cells/sxlib/a4_x4.vbe
+++ b/alliance/share/cells/sxlib/a4_x4.vbe
@@ -37,5 +37,6 @@ END a4_x4;
 ARCHITECTURE behaviour_data_flow OF a4_x4 IS
 
 BEGIN
-  q <= (((i0 and i1) and i2) and i3) after 1254 ps;
+1254
+q <= (((i0 and i1) and i2) and i3) after 1300 ps;
 END;
diff --git a/alliance/share/cells/sxlib/buf_x2.vbe b/alliance/share/cells/sxlib/buf_x2.vbe
index 6b2fe9a6..9277f6c4 100644
--- a/alliance/share/cells/sxlib/buf_x2.vbe
+++ b/alliance/share/cells/sxlib/buf_x2.vbe
@@ -19,5 +19,6 @@ END buf_x2;
 ARCHITECTURE behaviour_data_flow OF buf_x2 IS
 
 BEGIN
-  q <= i after 1008 ps;
+1008
+q <= i after 1000 ps;
 END;
diff --git a/alliance/share/cells/sxlib/buf_x4.vbe b/alliance/share/cells/sxlib/buf_x4.vbe
index 0d932c36..fcd624b1 100644
--- a/alliance/share/cells/sxlib/buf_x4.vbe
+++ b/alliance/share/cells/sxlib/buf_x4.vbe
@@ -19,5 +19,6 @@ END buf_x4;
 ARCHITECTURE behaviour_data_flow OF buf_x4 IS
 
 BEGIN
-  q <= i after 1008 ps;
+1008
+q <= i after 1000 ps;
 END;
diff --git a/alliance/share/cells/sxlib/buf_x8.vbe b/alliance/share/cells/sxlib/buf_x8.vbe
index b3ea8508..c7e11873 100644
--- a/alliance/share/cells/sxlib/buf_x8.vbe
+++ b/alliance/share/cells/sxlib/buf_x8.vbe
@@ -19,5 +19,6 @@ END buf_x8;
 ARCHITECTURE behaviour_data_flow OF buf_x8 IS
 
 BEGIN
-  q <= i after 995 ps;
+995
+q <= i after 1000 ps;
 END;
diff --git a/alliance/share/cells/sxlib/inv_x1.vbe b/alliance/share/cells/sxlib/inv_x1.vbe
index 58a47b3c..4234921f 100644
--- a/alliance/share/cells/sxlib/inv_x1.vbe
+++ b/alliance/share/cells/sxlib/inv_x1.vbe
@@ -19,5 +19,6 @@ END inv_x1;
 ARCHITECTURE behaviour_data_flow OF inv_x1 IS
 
 BEGIN
-  nq <= not (i) after 739 ps;
+739
+nq <= not (i) after 700 ps;
 END;
diff --git a/alliance/share/cells/sxlib/inv_x2.vbe b/alliance/share/cells/sxlib/inv_x2.vbe
index 2c9660f6..243ffaa5 100644
--- a/alliance/share/cells/sxlib/inv_x2.vbe
+++ b/alliance/share/cells/sxlib/inv_x2.vbe
@@ -19,5 +19,6 @@ END inv_x2;
 ARCHITECTURE behaviour_data_flow OF inv_x2 IS
 
 BEGIN
-  nq <= not (i) after 762 ps;
+762
+nq <= not (i) after 800 ps;
 END;
diff --git a/alliance/share/cells/sxlib/inv_x4.vbe b/alliance/share/cells/sxlib/inv_x4.vbe
index d7371753..6439abcb 100644
--- a/alliance/share/cells/sxlib/inv_x4.vbe
+++ b/alliance/share/cells/sxlib/inv_x4.vbe
@@ -19,5 +19,6 @@ END inv_x4;
 ARCHITECTURE behaviour_data_flow OF inv_x4 IS
 
 BEGIN
-  nq <= not (i) after 742 ps;
+742
+nq <= not (i) after 700 ps;
 END;
diff --git a/alliance/share/cells/sxlib/inv_x8.vbe b/alliance/share/cells/sxlib/inv_x8.vbe
index ec93f201..fdf15c12 100644
--- a/alliance/share/cells/sxlib/inv_x8.vbe
+++ b/alliance/share/cells/sxlib/inv_x8.vbe
@@ -19,5 +19,6 @@ END inv_x8;
 ARCHITECTURE behaviour_data_flow OF inv_x8 IS
 
 BEGIN
-  nq <= not (i) after 732 ps;
+732
+nq <= not (i) after 700 ps;
 END;
diff --git a/alliance/share/cells/sxlib/mx2_x2.vbe b/alliance/share/cells/sxlib/mx2_x2.vbe
index 2964d47d..6456e0c1 100644
--- a/alliance/share/cells/sxlib/mx2_x2.vbe
+++ b/alliance/share/cells/sxlib/mx2_x2.vbe
@@ -35,5 +35,6 @@ END mx2_x2;
 ARCHITECTURE behaviour_data_flow OF mx2_x2 IS
 
 BEGIN
-  q <= ((i1 and cmd) or (not (cmd) and i0)) after 1132 ps;
+1132
+q <= ((i1 and cmd) or (not (cmd) and i0)) after 1100 ps;
 END;
diff --git a/alliance/share/cells/sxlib/mx2_x4.vbe b/alliance/share/cells/sxlib/mx2_x4.vbe
index dbfd50c3..cde250c9 100644
--- a/alliance/share/cells/sxlib/mx2_x4.vbe
+++ b/alliance/share/cells/sxlib/mx2_x4.vbe
@@ -35,5 +35,6 @@ END mx2_x4;
 ARCHITECTURE behaviour_data_flow OF mx2_x4 IS
 
 BEGIN
-  q <= ((i1 and cmd) or (not (cmd) and i0)) after 1245 ps;
+1245
+q <= ((i1 and cmd) or (not (cmd) and i0)) after 1200 ps;
 END;
diff --git a/alliance/share/cells/sxlib/na2_x1.vbe b/alliance/share/cells/sxlib/na2_x1.vbe
index e390532d..1f494e14 100644
--- a/alliance/share/cells/sxlib/na2_x1.vbe
+++ b/alliance/share/cells/sxlib/na2_x1.vbe
@@ -25,5 +25,6 @@ END na2_x1;
 ARCHITECTURE behaviour_data_flow OF na2_x1 IS
 
 BEGIN
-  nq <= not ((i0 and i1)) after 894 ps;
+894
+nq <= not ((i0 and i1)) after 900 ps;
 END;
diff --git a/alliance/share/cells/sxlib/na2_x4.vbe b/alliance/share/cells/sxlib/na2_x4.vbe
index 7fb7c819..8e2c0d94 100644
--- a/alliance/share/cells/sxlib/na2_x4.vbe
+++ b/alliance/share/cells/sxlib/na2_x4.vbe
@@ -25,5 +25,6 @@ END na2_x4;
 ARCHITECTURE behaviour_data_flow OF na2_x4 IS
 
 BEGIN
-  nq <= not ((i0 and i1)) after 1206 ps;
+1206
+nq <= not ((i0 and i1)) after 1200 ps;
 END;
diff --git a/alliance/share/cells/sxlib/na3_x1.vbe b/alliance/share/cells/sxlib/na3_x1.vbe
index 37d7f255..ddd3baf3 100644
--- a/alliance/share/cells/sxlib/na3_x1.vbe
+++ b/alliance/share/cells/sxlib/na3_x1.vbe
@@ -31,5 +31,6 @@ END na3_x1;
 ARCHITECTURE behaviour_data_flow OF na3_x1 IS
 
 BEGIN
-  nq <= not (((i0 and i1) and i2)) after 969 ps;
+969
+nq <= not (((i0 and i1) and i2)) after 1000 ps;
 END;
diff --git a/alliance/share/cells/sxlib/na3_x4.vbe b/alliance/share/cells/sxlib/na3_x4.vbe
index 5a219360..7633aa16 100644
--- a/alliance/share/cells/sxlib/na3_x4.vbe
+++ b/alliance/share/cells/sxlib/na3_x4.vbe
@@ -31,5 +31,6 @@ END na3_x4;
 ARCHITECTURE behaviour_data_flow OF na3_x4 IS
 
 BEGIN
-  nq <= not (((i0 and i1) and i2)) after 1294 ps;
+1294
+nq <= not (((i0 and i1) and i2)) after 1300 ps;
 END;
diff --git a/alliance/share/cells/sxlib/na4_x1.vbe b/alliance/share/cells/sxlib/na4_x1.vbe
index 3a8ceb53..92649092 100644
--- a/alliance/share/cells/sxlib/na4_x1.vbe
+++ b/alliance/share/cells/sxlib/na4_x1.vbe
@@ -37,5 +37,6 @@ END na4_x1;
 ARCHITECTURE behaviour_data_flow OF na4_x1 IS
 
 BEGIN
-  nq <= not ((((i0 and i1) and i2) and i3)) after 1037 ps;
+1037
+nq <= not ((((i0 and i1) and i2) and i3)) after 1000 ps;
 END;
diff --git a/alliance/share/cells/sxlib/na4_x4.vbe b/alliance/share/cells/sxlib/na4_x4.vbe
index 6026cd6a..6cad79af 100644
--- a/alliance/share/cells/sxlib/na4_x4.vbe
+++ b/alliance/share/cells/sxlib/na4_x4.vbe
@@ -37,5 +37,6 @@ END na4_x4;
 ARCHITECTURE behaviour_data_flow OF na4_x4 IS
 
 BEGIN
-  nq <= not ((((i0 and i1) and i2) and i3)) after 1373 ps;
+1373
+nq <= not ((((i0 and i1) and i2) and i3)) after 1400 ps;
 END;
diff --git a/alliance/share/cells/sxlib/nao2o22_x1.vbe b/alliance/share/cells/sxlib/nao2o22_x1.vbe
index 914b27a1..bbcbb82b 100644
--- a/alliance/share/cells/sxlib/nao2o22_x1.vbe
+++ b/alliance/share/cells/sxlib/nao2o22_x1.vbe
@@ -37,5 +37,6 @@ END nao2o22_x1;
 ARCHITECTURE behaviour_data_flow OF nao2o22_x1 IS
 
 BEGIN
-  nq <= not (((i0 or i1) and (i2 or i3))) after 981 ps;
+981
+nq <= not (((i0 or i1) and (i2 or i3))) after 1000 ps;
 END;
diff --git a/alliance/share/cells/sxlib/nao2o22_x4.vbe b/alliance/share/cells/sxlib/nao2o22_x4.vbe
index c7fca5e8..6e0efe15 100644
--- a/alliance/share/cells/sxlib/nao2o22_x4.vbe
+++ b/alliance/share/cells/sxlib/nao2o22_x4.vbe
@@ -37,5 +37,6 @@ END nao2o22_x4;
 ARCHITECTURE behaviour_data_flow OF nao2o22_x4 IS
 
 BEGIN
-  nq <= not (((i0 or i1) and (i2 or i3))) after 1403 ps;
+1403
+nq <= not (((i0 or i1) and (i2 or i3))) after 1400 ps;
 END;
diff --git a/alliance/share/cells/sxlib/nmx2_x1.vbe b/alliance/share/cells/sxlib/nmx2_x1.vbe
index fdfb982c..a674bb53 100644
--- a/alliance/share/cells/sxlib/nmx2_x1.vbe
+++ b/alliance/share/cells/sxlib/nmx2_x1.vbe
@@ -35,5 +35,6 @@ END nmx2_x1;
 ARCHITECTURE behaviour_data_flow OF nmx2_x1 IS
 
 BEGIN
-  nq <= not (((i0 and not (cmd)) or (i1 and cmd))) after 1009 ps;
+1009
+nq <= not (((i0 and not (cmd)) or (i1 and cmd))) after 1000 ps;
 END;
diff --git a/alliance/share/cells/sxlib/nmx2_x4.vbe b/alliance/share/cells/sxlib/nmx2_x4.vbe
index 0849e9fc..db471eb7 100644
--- a/alliance/share/cells/sxlib/nmx2_x4.vbe
+++ b/alliance/share/cells/sxlib/nmx2_x4.vbe
@@ -35,5 +35,6 @@ END nmx2_x4;
 ARCHITECTURE behaviour_data_flow OF nmx2_x4 IS
 
 BEGIN
-  nq <= not (((i0 and not (cmd)) or (i1 and cmd))) after 1300 ps;
+1300
+nq <= not (((i0 and not (cmd)) or (i1 and cmd))) after 1300 ps;
 END;
diff --git a/alliance/share/cells/sxlib/no2_x1.vbe b/alliance/share/cells/sxlib/no2_x1.vbe
index f92f56f8..8a630d8c 100644
--- a/alliance/share/cells/sxlib/no2_x1.vbe
+++ b/alliance/share/cells/sxlib/no2_x1.vbe
@@ -25,5 +25,6 @@ END no2_x1;
 ARCHITECTURE behaviour_data_flow OF no2_x1 IS
 
 BEGIN
-  nq <= not ((i0 or i1)) after 903 ps;
+903
+nq <= not ((i0 or i1)) after 900 ps;
 END;
diff --git a/alliance/share/cells/sxlib/no2_x4.vbe b/alliance/share/cells/sxlib/no2_x4.vbe
index 0ec5f15a..c2b42a4f 100644
--- a/alliance/share/cells/sxlib/no2_x4.vbe
+++ b/alliance/share/cells/sxlib/no2_x4.vbe
@@ -25,5 +25,6 @@ END no2_x4;
 ARCHITECTURE behaviour_data_flow OF no2_x4 IS
 
 BEGIN
-  nq <= not ((i0 or i1)) after 1210 ps;
+1210
+nq <= not ((i0 or i1)) after 1200 ps;
 END;
diff --git a/alliance/share/cells/sxlib/no3_x1.vbe b/alliance/share/cells/sxlib/no3_x1.vbe
index 4a76378b..e71ac0ca 100644
--- a/alliance/share/cells/sxlib/no3_x1.vbe
+++ b/alliance/share/cells/sxlib/no3_x1.vbe
@@ -31,5 +31,6 @@ END no3_x1;
 ARCHITECTURE behaviour_data_flow OF no3_x1 IS
 
 BEGIN
-  nq <= not (((i0 or i1) or i2)) after 1010 ps;
+1010
+nq <= not (((i0 or i1) or i2)) after 1000 ps;
 END;
diff --git a/alliance/share/cells/sxlib/no3_x4.vbe b/alliance/share/cells/sxlib/no3_x4.vbe
index 80f8d536..0a1d0c83 100644
--- a/alliance/share/cells/sxlib/no3_x4.vbe
+++ b/alliance/share/cells/sxlib/no3_x4.vbe
@@ -31,5 +31,6 @@ END no3_x4;
 ARCHITECTURE behaviour_data_flow OF no3_x4 IS
 
 BEGIN
-  nq <= not (((i0 or i1) or i2)) after 1317 ps;
+1317
+nq <= not (((i0 or i1) or i2)) after 1300 ps;
 END;
diff --git a/alliance/share/cells/sxlib/no4_x1.vbe b/alliance/share/cells/sxlib/no4_x1.vbe
index bd0bf475..266d4930 100644
--- a/alliance/share/cells/sxlib/no4_x1.vbe
+++ b/alliance/share/cells/sxlib/no4_x1.vbe
@@ -37,5 +37,6 @@ END no4_x1;
 ARCHITECTURE behaviour_data_flow OF no4_x1 IS
 
 BEGIN
-  nq <= not ((((i0 or i1) or i2) or i3)) after 1101 ps;
+1101
+nq <= not ((((i0 or i1) or i2) or i3)) after 1100 ps;
 END;
diff --git a/alliance/share/cells/sxlib/no4_x4.vbe b/alliance/share/cells/sxlib/no4_x4.vbe
index 5d8d1a91..7dbf96ea 100644
--- a/alliance/share/cells/sxlib/no4_x4.vbe
+++ b/alliance/share/cells/sxlib/no4_x4.vbe
@@ -37,5 +37,6 @@ END no4_x4;
 ARCHITECTURE behaviour_data_flow OF no4_x4 IS
 
 BEGIN
-  nq <= not ((((i0 or i1) or i2) or i3)) after 1415 ps;
+1415
+nq <= not ((((i0 or i1) or i2) or i3)) after 1400 ps;
 END;
diff --git a/alliance/share/cells/sxlib/noa2a22_x1.vbe b/alliance/share/cells/sxlib/noa2a22_x1.vbe
index f8f41004..095a1aab 100644
--- a/alliance/share/cells/sxlib/noa2a22_x1.vbe
+++ b/alliance/share/cells/sxlib/noa2a22_x1.vbe
@@ -37,5 +37,6 @@ END noa2a22_x1;
 ARCHITECTURE behaviour_data_flow OF noa2a22_x1 IS
 
 BEGIN
-  nq <= not (((i0 and i1) or (i2 and i3))) after 968 ps;
+968
+nq <= not (((i0 and i1) or (i2 and i3))) after 1000 ps;
 END;
diff --git a/alliance/share/cells/sxlib/noa2a22_x4.vbe b/alliance/share/cells/sxlib/noa2a22_x4.vbe
index 12e8ed31..46e03fb9 100644
--- a/alliance/share/cells/sxlib/noa2a22_x4.vbe
+++ b/alliance/share/cells/sxlib/noa2a22_x4.vbe
@@ -37,5 +37,6 @@ END noa2a22_x4;
 ARCHITECTURE behaviour_data_flow OF noa2a22_x4 IS
 
 BEGIN
-  nq <= not (((i0 and i1) or (i2 and i3))) after 1394 ps;
+1394
+nq <= not (((i0 and i1) or (i2 and i3))) after 1400 ps;
 END;
diff --git a/alliance/share/cells/sxlib/nts_x1.vbe b/alliance/share/cells/sxlib/nts_x1.vbe
index 3b09437c..4819d2a2 100644
--- a/alliance/share/cells/sxlib/nts_x1.vbe
+++ b/alliance/share/cells/sxlib/nts_x1.vbe
@@ -28,7 +28,8 @@ BEGIN
 
   label0 : BLOCK (cmd = '1')
   BEGIN
-    nq <= GUARDED not (i) after 848 ps;
+848
+nq <= GUARDED not (i) after 800 ps;
   END BLOCK label0;
 
 END;
diff --git a/alliance/share/cells/sxlib/nts_x2.vbe b/alliance/share/cells/sxlib/nts_x2.vbe
index 3920a833..42ca6239 100644
--- a/alliance/share/cells/sxlib/nts_x2.vbe
+++ b/alliance/share/cells/sxlib/nts_x2.vbe
@@ -28,7 +28,8 @@ BEGIN
 
   label0 : BLOCK (cmd = '1')
   BEGIN
-    nq <= GUARDED not (i) after 928 ps;
+928
+nq <= GUARDED not (i) after 900 ps;
   END BLOCK label0;
 
 END;
diff --git a/alliance/share/cells/sxlib/nxr2_x1.vbe b/alliance/share/cells/sxlib/nxr2_x1.vbe
index 303863b0..8b03c9af 100644
--- a/alliance/share/cells/sxlib/nxr2_x1.vbe
+++ b/alliance/share/cells/sxlib/nxr2_x1.vbe
@@ -33,5 +33,6 @@ END nxr2_x1;
 ARCHITECTURE behaviour_data_flow OF nxr2_x1 IS
 
 BEGIN
-  nq <= not ((i0 xor i1)) after 1100 ps;
+1100
+nq <= not ((i0 xor i1)) after 1100 ps;
 END;
diff --git a/alliance/share/cells/sxlib/nxr2_x4.vbe b/alliance/share/cells/sxlib/nxr2_x4.vbe
index acb266cc..2c28343f 100644
--- a/alliance/share/cells/sxlib/nxr2_x4.vbe
+++ b/alliance/share/cells/sxlib/nxr2_x4.vbe
@@ -33,5 +33,6 @@ END nxr2_x4;
 ARCHITECTURE behaviour_data_flow OF nxr2_x4 IS
 
 BEGIN
-  nq <= not ((i0 xor i1)) after 1163 ps;
+1163
+nq <= not ((i0 xor i1)) after 1200 ps;
 END;
diff --git a/alliance/share/cells/sxlib/o2_x2.vbe b/alliance/share/cells/sxlib/o2_x2.vbe
index 0de99029..dd6298ad 100644
--- a/alliance/share/cells/sxlib/o2_x2.vbe
+++ b/alliance/share/cells/sxlib/o2_x2.vbe
@@ -25,5 +25,6 @@ END o2_x2;
 ARCHITECTURE behaviour_data_flow OF o2_x2 IS
 
 BEGIN
-  q <= (i0 or i1) after 1003 ps;
+1003
+q <= (i0 or i1) after 1000 ps;
 END;
diff --git a/alliance/share/cells/sxlib/o2_x4.vbe b/alliance/share/cells/sxlib/o2_x4.vbe
index 4e7fed20..cab638c6 100644
--- a/alliance/share/cells/sxlib/o2_x4.vbe
+++ b/alliance/share/cells/sxlib/o2_x4.vbe
@@ -25,5 +25,6 @@ END o2_x4;
 ARCHITECTURE behaviour_data_flow OF o2_x4 IS
 
 BEGIN
-  q <= (i0 or i1) after 1087 ps;
+1087
+q <= (i0 or i1) after 1100 ps;
 END;
diff --git a/alliance/share/cells/sxlib/o3_x2.vbe b/alliance/share/cells/sxlib/o3_x2.vbe
index 2905532a..b6fa21c4 100644
--- a/alliance/share/cells/sxlib/o3_x2.vbe
+++ b/alliance/share/cells/sxlib/o3_x2.vbe
@@ -31,5 +31,6 @@ END o3_x2;
 ARCHITECTURE behaviour_data_flow OF o3_x2 IS
 
 BEGIN
-  q <= ((i0 or i1) or i2) after 1104 ps;
+1104
+q <= ((i0 or i1) or i2) after 1100 ps;
 END;
diff --git a/alliance/share/cells/sxlib/o3_x4.vbe b/alliance/share/cells/sxlib/o3_x4.vbe
index ad388b8b..5ba5c853 100644
--- a/alliance/share/cells/sxlib/o3_x4.vbe
+++ b/alliance/share/cells/sxlib/o3_x4.vbe
@@ -31,5 +31,6 @@ END o3_x4;
 ARCHITECTURE behaviour_data_flow OF o3_x4 IS
 
 BEGIN
-  q <= ((i0 or i1) or i2) after 1220 ps;
+1220
+q <= ((i0 or i1) or i2) after 1200 ps;
 END;
diff --git a/alliance/share/cells/sxlib/o4_x2.vbe b/alliance/share/cells/sxlib/o4_x2.vbe
index 5e48c2ee..e38fd47b 100644
--- a/alliance/share/cells/sxlib/o4_x2.vbe
+++ b/alliance/share/cells/sxlib/o4_x2.vbe
@@ -37,5 +37,6 @@ END o4_x2;
 ARCHITECTURE behaviour_data_flow OF o4_x2 IS
 
 BEGIN
-  q <= (((i0 or i1) or i2) or i3) after 1224 ps;
+1224
+q <= (((i0 or i1) or i2) or i3) after 1200 ps;
 END;
diff --git a/alliance/share/cells/sxlib/o4_x4.vbe b/alliance/share/cells/sxlib/o4_x4.vbe
index 57435182..2d5d5f01 100644
--- a/alliance/share/cells/sxlib/o4_x4.vbe
+++ b/alliance/share/cells/sxlib/o4_x4.vbe
@@ -37,5 +37,6 @@ END o4_x4;
 ARCHITECTURE behaviour_data_flow OF o4_x4 IS
 
 BEGIN
-  q <= (((i0 or i1) or i2) or i3) after 1317 ps;
+1317
+q <= (((i0 or i1) or i2) or i3) after 1300 ps;
 END;
diff --git a/alliance/share/cells/sxlib/sff1_x4.vbe b/alliance/share/cells/sxlib/sff1_x4.vbe
index 615504c3..a92993c9 100644
--- a/alliance/share/cells/sxlib/sff1_x4.vbe
+++ b/alliance/share/cells/sxlib/sff1_x4.vbe
@@ -32,5 +32,6 @@ BEGIN
     sff_m <= GUARDED i;
   END BLOCK label0;
 
-  q <= sff_m after 1685 ps;
+1685
+q <= sff_m after 1700 ps;
 END;
diff --git a/alliance/share/cells/sxlib/sff2_x4.vbe b/alliance/share/cells/sxlib/sff2_x4.vbe
index cc41132d..15a5d494 100644
--- a/alliance/share/cells/sxlib/sff2_x4.vbe
+++ b/alliance/share/cells/sxlib/sff2_x4.vbe
@@ -44,5 +44,6 @@ BEGIN
     sff_m <= GUARDED ((i1 and cmd) or (i0 and not (cmd)));
   END BLOCK label0;
 
-  q <= sff_m after 1933 ps;
+1933
+q <= sff_m after 1900 ps;
 END;
diff --git a/alliance/share/cells/sxlib/ts_x4.vbe b/alliance/share/cells/sxlib/ts_x4.vbe
index b07c39ab..660b7b40 100644
--- a/alliance/share/cells/sxlib/ts_x4.vbe
+++ b/alliance/share/cells/sxlib/ts_x4.vbe
@@ -28,7 +28,8 @@ BEGIN
 
   label0 : BLOCK (cmd = '1')
   BEGIN
-    q <= GUARDED i after 1089 ps;
+1089
+q <= GUARDED i after 1100 ps;
   END BLOCK label0;
 
 END;
diff --git a/alliance/share/cells/sxlib/ts_x8.vbe b/alliance/share/cells/sxlib/ts_x8.vbe
index 3fba49e4..b9fc72f0 100644
--- a/alliance/share/cells/sxlib/ts_x8.vbe
+++ b/alliance/share/cells/sxlib/ts_x8.vbe
@@ -28,7 +28,8 @@ BEGIN
 
   label0 : BLOCK (cmd = '1')
   BEGIN
-    q <= GUARDED i after 1222 ps;
+1222
+q <= GUARDED i after 1200 ps;
   END BLOCK label0;
 
 END;
diff --git a/alliance/share/cells/sxlib/xr2_x1.vbe b/alliance/share/cells/sxlib/xr2_x1.vbe
index 3331850d..572c34c2 100644
--- a/alliance/share/cells/sxlib/xr2_x1.vbe
+++ b/alliance/share/cells/sxlib/xr2_x1.vbe
@@ -33,5 +33,6 @@ END xr2_x1;
 ARCHITECTURE behaviour_data_flow OF xr2_x1 IS
 
 BEGIN
-  q <= (i0 xor i1) after 1002 ps;
+1002
+q <= (i0 xor i1) after 1000 ps;
 END;
diff --git a/alliance/share/cells/sxlib/xr2_x4.vbe b/alliance/share/cells/sxlib/xr2_x4.vbe
index 3187b432..3bedb35b 100644
--- a/alliance/share/cells/sxlib/xr2_x4.vbe
+++ b/alliance/share/cells/sxlib/xr2_x4.vbe
@@ -33,5 +33,6 @@ END xr2_x4;
 ARCHITECTURE behaviour_data_flow OF xr2_x4 IS
 
 BEGIN
-  q <= (i0 xor i1) after 1253 ps;
+1253
+q <= (i0 xor i1) after 1300 ps;
 END;