Enhancments and restructuring