Improve a little of  the speed