Batching.
Fixed conflicts.