Upgraded Logging and Retry