Third step towards rebasing