adjusted fetching of data