Added the new changes suggested on pull request