some changes, batching