added rebase option back