Improved the speed a little more.