ENH:  Adding Brian's enhancements.