Maybe break updater even more?