* changes to fit new db structure