@rebase: more medical rewriting