changed all to use our new database (not working atm)