Updated for new "retry" functionality