Upgrading to new grunt