Improve slightly