final rebase