More changes after first upload