rebase and simply modify