started working on retry mechanism