Made updater part of main solution