Big update since Git had issues.