also update to new structure