enhanced maxRetries to 20