Newer version of the scripts upstream