More changes to scripts