[899753] Part 1: Added max col + row