Rebase and bring up