Adjust code lines
Merge branch 'col_check'