Will update per these suggestions.