update and rebasing