rebase & rest of translation