Still working on updater part