Improved speed dramatically.