added proper execute/retry strategy