Review and rebase changes