Added drastic speed improvement.