Further improvements and it's now in 80 ms