Improvements to grid