Minimal changes for the memory