ENH: Even better sampling