Updates per Rebekah feedback.