Sondag/with retries production ready