added undo-commit
changed to safe_upgrade