update for new database schema