updated to new db schema