Revert "Revert "speed""

This reverts commit 17a5b64a032b6ba0c099eeb493539207ab07795d.