Structure major rework