Huge update to updater