changes to updater
Merge with Paul