Updating the pull request to fix feedbacks