ENH:  Submitted version.