updated to the git version, diffs added