UPDATED pull request to newest version