Now with retry logic tested and working.