update to use better thenfetch