Got rid of a bottleneck