More batch changes