diff --git a/Conditions.js b/Conditions.js
index 00991af86..c921c5c40 100644
--- a/Conditions.js
+++ b/Conditions.js
@@ -310,8 +310,8 @@
             let currentDate = new Date(farLeftDate.valueOf());
 
             conditions = [];
-            headers = dailyFile[0];
-            let lastObjects = dailyFile[1]; // Here we get the values of the last 5 objects
+            
+     
 
             while (currentDate.valueOf() <= farRightDate.valueOf() + ONE_DAY_IN_MILISECONDS) {
 
@@ -319,7 +319,9 @@
 
                 let dailyFile = fileCursor.files.get(stringDate);
 
-                if (dailyFile[2] !== undefined) {
+                if (dailyFile !== undefined) {
+
+                    headers = dailyFile[0];
 
                     for (let i = 0; i < dailyFile[2].length; i++) {
 
diff --git a/TradingSimulation.js b/TradingSimulation.js
index 8239cb2be..568a5000c 100644
--- a/TradingSimulation.js
+++ b/TradingSimulation.js
@@ -327,16 +327,52 @@
                             rate: undefined,
                             amount: undefined,
                             balanceA: undefined,
-                            balanceB: undefined
+                            balanceB: undefined,
+                            profit: undefined,
+                            lastProfit: undefined,
+                            stopLoss: undefined,
+                            roundtrips: undefined,
+                            hits: undefined,
+                            fails: undefined,
+                            hitRatio: undefined,
+                            ROI: undefined,
+                            periods: undefined,
+                            days: undefined,
+                            anualizedRateOfReturn: undefined,
+                            sellRate: undefined,
+                            lastProfitPercent: undefined,
+                            strategy: undefined,
+                            strategyPhase: undefined,
+                            buyOrder: undefined,
+                            stopLossPhase: undefined,
+                            buyOrderPhase: undefined
                         };
 
-                        record.begin = marketFile[i][0];
-                        record.end = marketFile[i][1];
-                        record.type = marketFile[i][2];
-                        record.rate = marketFile[i][3];
-                        record.amount = marketFile[i][4];
-                        record.balanceA = marketFile[i][5];
-                        record.balanceB = marketFile[i][6];
+                        record.begin = dailyFile[i][0];
+                        record.end = dailyFile[i][1];
+                        record.type = dailyFile[i][2];
+                        record.rate = dailyFile[i][3];
+                        record.amount = dailyFile[i][4];
+                        record.balanceA = dailyFile[i][5];
+                        record.balanceB = dailyFile[i][6];
+                        record.profit = dailyFile[i][7];
+                        record.lastProfit = dailyFile[i][8];
+                        record.stopLoss = dailyFile[i][9];
+                        record.roundtrips = dailyFile[i][10];
+                        record.hits = dailyFile[i][11];
+                        record.fails = dailyFile[i][12];
+                        record.hitRatio = dailyFile[i][13];
+                        record.ROI = dailyFile[i][14];
+                        record.periods = dailyFile[i][15];
+                        record.days = dailyFile[i][16];
+                        record.anualizedRateOfReturn = dailyFile[i][17];
+                        record.sellRate = dailyFile[i][18];
+                        record.lastProfitPercent = dailyFile[i][19];
+                        record.strategy = dailyFile[i][20];
+                        record.strategyPhase = dailyFile[i][21];
+                        record.buyOrder = dailyFile[i][22];
+                        record.stopLossPhase = dailyFile[i][23];
+                        record.buyOrderPhase = dailyFile[i][24];
 
                         if (record.begin >= farLeftDate.valueOf() && record.end <= farRightDate.valueOf()) {