match new structure