adding choice to continue or not and rebase