Updated batch scripts