Changed to matrix grid