Develop - Make changes as per original pull request