All of the following changes in the file have been changed since I rebased the pull request and they should be looked at.