batch refactor continued