update batch
update saneshige's changes