Batching mechanism done minus visibility changes