some more retry goodness