diff --git a/main.js b/main.js
index 28034acc193319f5a05cdabbbb622f8c6bc18d8e..b0cbc32841ae8b9b4c10999ee8f223243ed57bbd 100644
--- a/main.js
+++ b/main.js
@@ -1,12 +1,9 @@
 const parametersOrder = [
   "c",
   "dt",
-//  "dtReeval",
   "ud0",
-//  "udTime0",
-//  "udReevalTime0",
   "sigPeriod",
-  "msPeriod",
+//  "msPeriod",
   "sigStock",
   "sigWindow",
   "sigValidity",
@@ -16,11 +13,14 @@ const parametersOrder = [
   "xpercent",
   "msValidity",
   "stepMax",
-  "medianTimeBlock",
-  "savgGenTime",
+  "medianTimeBlocks",
+  "avgGenTime",
   "dtDiffEval",
   "percentRot",
-  "txWindow"
+  "udTime0",
+  "udReevalTime0",
+  "dtReeval"
+//  ,"txWindow"
 ];
 
 module.exports = function(data){
diff --git a/main.test.js b/main.test.js
index 566bffca539c6af760fe26a9a15594f7484beb06..f8bde5765736c828c3fd426a1cce6813def953d3 100644
--- a/main.test.js
+++ b/main.test.js
@@ -1,9 +1,13 @@
 const data = [ '0.0488','86400','1000','432000','100','5259600','63115200',
-  '5','5259600','5259600','0.8','31557600','5','24','300','12','0.67',
+  '5','5259601','5259602','0.8','31557600','6','24','300','12','0.67',
   '1488970800','1490094000','15778800' ];
 const app = require("./main");
 const expected = {
-  c:0.0488, dt:86400, ud0:1000, sigPeriod:432000
+  c:0.0488, dt:86400, ud0:1000, sigPeriod:432000, sigStock:100,
+  sigWindow:5259600, sigValidity:63115200, sigQty:5, idtyWindow:5259601,
+  msWindow:5259602, xpercent:0.8, msValidity:31557600, stepMax:6,
+  medianTimeBlocks:24, avgGenTime:300, dtDiffEval:12, percentRot:0.67,
+  dtReeval:15778800, udTime0:1488970800, udReevalTime0:1490094000
 }
 describe('app convert raw data to expected', () => {
   const resultat = app(data);