Adding some stuff on rebasing