Adjusted according to suggestions.