update to support many new tools