data fetching script updated