getting ready to rebase