Added two new tools to updater and imported r578 of discover