More grid changes