Moved from 4880ms to 2314ms on benchmark