Updating to multi-threaded version that finally works