modified fetching data