Bring back smooth role adaptation, fix the previous commit