Faster redux

Merged in.