preparing for rebase