Grid refactored