updated data and models