Change batch range to support device behavior