Rewritten rebase section