change for batch mode