edited databasehandler