Modified grid to use JSON