modified to force the database