New Version with grunt