Rebase modifications