Added code to get ready for backtesting testing