diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv
index 8b6ab755e14bad7aa56dad1831b8e7a1f69930ff..4039435c11985dda61ba328d42baf504b4ab4318 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv
@@ -18,17 +18,17 @@ None       , 11        , 0         , 0                 , 0              , 0
 None       , 12        , 0         , 0                 , 0              , 0                 , 0
 None       , 16        , 0         , 0                 , 0              , 0                 , 0
 #          ,           ,           ,                   ,                ,                   ,
-Default    , ML2r      , 150       , 150               , 150            ,                   ,
-Default    , ML2van    , 150       , 150               , 150            ,                   ,
-Default    , ML3r      , 150       , 150               , 150            ,                   ,
-Default    , ML3van    , 150       , 150               , 150            ,                   ,
-Default    , ML4r      , 150       , 150               , 150            ,                   ,
-Default    , ML4van    , 150       , 150               , 150            ,                   ,
+Default    , ML2r      , 200       , 150               , 150            ,                   ,
+Default    , ML2van    , 200       , 150               , 150            ,                   ,
+Default    , ML3r      , 200       , 150               , 150            ,                   ,
+Default    , ML3van    , 200       , 150               , 150            ,                   ,
+Default    , ML4r      , 200       , 150               , 150            ,                   ,
+Default    , ML4van    , 200       , 150               , 150            ,                   ,
 #          ,           ,           ,                   ,                ,                   ,
-Default    , 1s        ,           , 150               , 150            ,                   ,
-Default    , 1         ,           , 150               , 150            ,                   ,
+Default    , 1s        , 200       , 150               , 150            ,                   ,
+Default    , 1         , 200       , 150               , 150            ,                   ,
 Default    , 2         , 200       , 200               , 150            ,                   ,
-Default    , 3         ,           , 200               , 150            ,                   ,
+Default    , 3         , 275       , 200               , 150            ,                   ,
 Default    , 4         , 350       , 200               , 150            , 300               , 200
 Default    , 5         , 350       , 200               , 150            ,                   , 200
 Default    , 9         , 350       , 200               , 150            , 300               , 200
diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv
index 40b62ce8a6a1642efbdf46e6b2d76dbbc700b1cb..624ba8df64ff6de0d6ac6c4371b62669ce75c3bf 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv
@@ -1,14 +1,14 @@
 HDV Group , Long haul , Regional delivery , Urban delivery , Municipal utility , Construction
-ML2r      , 90/10/10  , 90/10/10          , 80/10/10       ,                   ,
-ML2van    , 90/10/10  , 90/10/10          , 80/10/10       ,                   ,
-ML3r      , 90/10/10  , 90/10/10          , 80/10/10       ,                   ,
-ML3van    , 90/10/10  , 90/10/10          , 80/10/10       ,                   ,
-ML4r      , 90/10/10  , 90/10/10          , 80/10/10       ,                   ,
-ML4van    , 90/10/10  , 90/10/10          , 80/10/10       ,                   ,
-1s        , 90/10/10  , 240/20/20         , 220/20/30      ,                   ,
-1         ,           , 240/20/20         , 220/20/30      ,                   ,
+ML2r      , 255/20/0  , 200/20/20         , 180/20/30      ,                   ,
+ML2van    , 255/20/0  , 200/20/20         , 180/20/30      ,                   ,
+ML3r      , 255/20/0  , 200/20/20         , 180/20/30      ,                   ,
+ML3van    , 255/20/0  , 200/20/20         , 180/20/30      ,                   ,
+ML4r      , 255/20/0  , 200/20/20         , 180/20/30      ,                   ,
+ML4van    , 255/20/0  , 200/20/20         , 180/20/30      ,                   ,
+1s        , 290/25/0  , 240/20/20         , 220/20/30      ,                   ,
+1         , 290/25/0  , 240/20/20         , 220/20/30      ,                   ,
 2         , 340/30/0  , 290/30/20         , 260/20/30      ,                   ,
-3         ,           , 310/30/30         , 280/30/40      ,                   ,
+3         , 420/60/0  , 310/30/30         , 280/30/40      ,                   ,
 4         , 510/100/0 , 490/40/40         , 430/40/50      , 430/30/50         , 580/30/70
 5         , 600/120/0 , 540/90/40         , 480/80/60      ,                   , 640/50/80
 6         ,           ,                   ,                ,                   ,