rebase on new library