PR #656 - Use batching for the updates