updated batch setup