Newer version of the script upstream