Incorporated Harry's suggestions.