More changes in scripts