Updates based on feedback from Terri