new rebasing