Improved the grid