Batch mode added again