Major bottleneck fixed! (almost)