Rebase with new codes