Incorporate @annapawlicka comments.