Added updater code
Attempting merge fix