Minor changes to the script