Updated with suggestions.