updated to new grid