update w/ save and retry, refined styles