A few tweeks to speed improvement.