Some useless commit message. This version works fine and is a massive speed improvement over earlier.