All data arrays implemented as two dimensional array
Little more changes