Improved speed greatly.