Use fetch instead of remote update
wip