More changes to the scripts