further uuid / key changes.