something wierd is happening with the rebase...