Corrected grid class