Tweaked the rebasing bit.