updated column names to match new db schema