Tweaked control scheme