modified a little bit the db