Modified with SmartGit