update Fetch, improvements