Added support for guessing bottleneck, still not working, but closer.