Updated batch script