Added db_view
fixed merge