Structure re-work