Make some improvements for higher spped.