--Included comments from Yash in the pull request...