More work on batching