BatchSampling minor modifications