Added upades from col_span changes