first serious rebase