Refactoring/Remaning
Updater movements