Simplify demo (one batch), add data sources
Stragglers