manual rebasing