diff --git a/LowFrequencyTrading/TradingEngine.js b/LowFrequencyTrading/TradingEngine.js
index 159e5d392..865713d7f 100644
--- a/LowFrequencyTrading/TradingEngine.js
+++ b/LowFrequencyTrading/TradingEngine.js
@@ -74,18 +74,18 @@ exports.newTradingEngine = function newTradingEngine(bot, logger) {
                 tradingEngine.current.episode.cycle.end.value =
                     tradingEngine.current.episode.candle.begin.value +
                     sessionParameters.timeFrame.config.value +
-                    sessionParameters.timeFrame.config.value / 4 - 1
+                    sessionParameters.timeFrame.config.value / 2 - 1
                 break
             }
             case 'Second': {
                 tradingEngine.current.episode.cycle.begin.value =
                     tradingEngine.current.episode.candle.begin.value +
                     sessionParameters.timeFrame.config.value +
-                    sessionParameters.timeFrame.config.value / 4
+                    sessionParameters.timeFrame.config.value / 2
                 tradingEngine.current.episode.cycle.end.value =
                     tradingEngine.current.episode.candle.begin.value +
                     sessionParameters.timeFrame.config.value +
-                    sessionParameters.timeFrame.config.value * 2 / 4 - 1
+                    sessionParameters.timeFrame.config.value * 4 / 4 - 1
                 break
             }
         }
diff --git a/LowFrequencyTrading/TradingSimulation.js b/LowFrequencyTrading/TradingSimulation.js
index 46ab10021..6a8e98a75 100644
--- a/LowFrequencyTrading/TradingSimulation.js
+++ b/LowFrequencyTrading/TradingSimulation.js
@@ -197,7 +197,6 @@ exports.newTradingSimulation = function newTradingSimulation(bot, logger, UTILIT
 
                 if (tradingEngine.current.episode.candle.index.value + 1 < candles.length) {
 
-                    console.log('Processing Candle: ' + tradingEngine.current.episode.candle.index.value)
                     /* Add new records to the process output */
                     tradingRecordsModule.appendRecords('Second')
 
diff --git a/LowFrequencyTrading/TradingStages.js b/LowFrequencyTrading/TradingStages.js
index b2a598110..2c2abf525 100644
--- a/LowFrequencyTrading/TradingStages.js
+++ b/LowFrequencyTrading/TradingStages.js
@@ -876,16 +876,9 @@ exports.newTradingStages = function newTradingStages(bot, logger, tradingEngineM
         switch (tradingEngineStage.stageDefinedIn.value) {
             case 'Base Asset': {
                 if (
-                    (
-                        tradingEngineStage.stageBaseAsset.sizePlaced >=
-                        tradingEngineStage.stageBaseAsset.targetSize
-                    )
-                    &&
-                    (
-                        tradingEngineStage.stageBaseAsset.sizeFilled.value +
-                        tradingEngineStage.stageBaseAsset.feesPaid.value >=
-                        tradingEngineStage.stageBaseAsset.sizePlaced.value
-                    )
+                    tradingEngineStage.stageBaseAsset.sizeFilled.value +
+                    tradingEngineStage.stageBaseAsset.feesPaid.value >=
+                    tradingEngineStage.stageBaseAsset.targetSize
                 ) {
                     positionFilled()
                 } else {
@@ -895,16 +888,9 @@ exports.newTradingStages = function newTradingStages(bot, logger, tradingEngineM
             }
             case 'Quoted Asset': {
                 if (
-                    (
-                        tradingEngineStage.stageQuotedAsset.sizePlaced >=
-                        tradingEngineStage.stageQuotedAsset.targetSize
-                    )
-                    &&
-                    (
-                        tradingEngineStage.stageQuotedAsset.sizeFilled.value +
-                        tradingEngineStage.stageQuotedAsset.feesPaid.value >=
-                        tradingEngineStage.stageQuotedAsset.sizePlaced.value
-                    )
+                    tradingEngineStage.stageQuotedAsset.sizeFilled.value +
+                    tradingEngineStage.stageQuotedAsset.feesPaid.value >=
+                    tradingEngineStage.stageQuotedAsset.targetSize
                 ) {
                     positionFilled()
                 } else {