Update to adjust column count with upstream