modifications for new structure