Major speed improvement.