structural rework again