Optimizations for async + speed test
Merge conflict