always rebase, minor changes