Improve sample a little