Updating for rebase from audit-mode