changing for new site format
a little backtest improvements