updated data and structure