Little bit more work on the grid