rebase on new fw