GIT BUG: Re-adds the code from Pros' commits.