Tweaked grunt more