Second step towards rebasing