Added Anna's suggestions.