adapt to new column names