Tweaked riggedyanne behavior