More changes and repo change