Updated to take into account convert to git