[WIP] Better updater