modified with the Setting up the DB