fixed to new database updates