adjustments for new structure