Reverted back to 16-bit MAF cell values and increased the MAF table length to 32 cells