rebase/retrack