Added rebase ability