Redo structure.