added some rebase stuff