One more question just to be sure - is it intended that in advantagous situation one rolls with advantage (3 dice drop the lowest) and in disadvantagous situation one rolls normally (2 dice), but escalate the consequences on failure and partial success?