update to match new db structure