update to the new structure