updated to work with changes in columns.Columns