Redo out of scope changes and underlying structure