Changed to 2d array