Rebase script updated