preparing for the new structure and sync