rebase attempt pt2