Nikki-suggested changes.