Retry with commit

Extensive updates