More grid enhancements. Enhance!