Even more speed improvement.