Batch run logic change