updated data fetch