had to commit thumbs to rebase