Some changes to the script and version0