added batch/stochastic, not working yet