new version without quantstrat