Put tryGather everywhere that residuals and watersheds appear