Complete rebase