Improve just a little