Upgraded to new retry api