boo boo edit - after a rebase