Added new grid functionality