added rebase option