small changes to fetch