less batches
Merge pull request #509 from willtp87/7.x

less batches