Initial attempt with updater code