Full rebase functionality in controller