updates for new structure