Fewer rest calls, more randomization

Yeah, that has merit. Good point.