Cherry pick new grid