Made changes trying to satisfy the pull request