Adding suggested rebase change