Added major bottleneck TODO