changes in data fetching design