Updates based upon Heidi's comments.