added a little extrapolation on rebase option