more rebasing