Changed the way the grid is retrieved