rework on manual updater