rebasing some things