Fixed bottleneck completely