New rebase method