Adjust row/col and be more explicit