merge rebase changes...hopefully