Improve highlight