Adding Kristinas suggestions.