Update based on the suggestions.