Tidied up the rebase