Rebasing guidance