Improved a little more the speed.