Incorporating kwc's suggestions.