updates per CR with Jeffrey