updated for new db