ENH:  Addressing Brian's comments.