ENH: addressing discussion.