Change to core structure