Update to grid, added ordering