Improved the speed.