Implement rebasing