XXX - refactor update completion