change some fetch