some changes to the fetcher