Batch flags + optimizations