Fixed a little bit of the bottleneck at small scale