Incorporating some suggestions.