new rebase after restapi