Addressed comments on ee475f833225d0280c483e1e7d3b70fc14ae7da0