ENH:  revisions part 2