added auto retry