rebase modification