integrating various comments
integrating various comments