ENH:  Adding Brian's changes.