added databasehandler and commented