ENH: better results