1.7.1, massive speed improvement