Better grunt performance