Fewer rest calls, more randomization

Actually I'm guessing the one causing the most problems was wcw