Modified with SmartGit2