moved to batches - fixes #5