Update the scripts to use the new ARGS logic