updated to fit new column names