diff --git a/src/flask_covid19/blueprints/data_rki_cases/b.py b/src/flask_covid19/blueprints/data_rki_cases/b.py
new file mode 100644
index 0000000000000000000000000000000000000000..3eef00018c117e7560444d39aa31255128c3e492
--- /dev/null
+++ b/src/flask_covid19/blueprints/data_rki_cases/b.py
@@ -0,0 +1,21 @@
+fid=o_import.fid,
+# id_bundesland=o_import.,
+# bundesland=o_import.,
+# landkreis=o_import.,
+altersgruppe=o_import.altersgruppe,
+geschlecht=o_import.geschlecht,
+anzahl_fall=o_import.anzahl_fall,
+anzahl_todesfall=o_import.anzahl_todesfall,
+# meldedatum=o_import.,
+# id_landkreis=o_import.,
+datenstand=o_import.datenstand,
+neuer_fall=o_import.neuer_fall,
+neuer_todesfall=o_import.neuer_todesfall,
+ref_datum=o_import.ref_datum,
+neu_genesen=o_import.neu_genesen,
+anzahl_genesen=o_import.anzahl_genesen,
+ist_erkrankungsbeginn=o_import.ist_erkrankungsbeginn,
+altersgruppe2=o_import.altersgruppe2,
+# datum=o_import.datum,
+processed_update=o_import.processed_update,
+processed_full_update=o_import.processed_full_update,
diff --git a/src/flask_covid19/blueprints/data_rki_cases/rki_model.py b/src/flask_covid19/blueprints/data_rki_cases/rki_model.py
index 6c874a7642d26bbb76369ef60d97bd3397aa847f..9068a753d1775d317a4d9221810580f9b1af1348 100644
--- a/src/flask_covid19/blueprints/data_rki_cases/rki_model.py
+++ b/src/flask_covid19/blueprints/data_rki_cases/rki_model.py
@@ -116,10 +116,10 @@ class RkiLandkreis(BlueprintLocation):
 
     @classmethod
     def get_all_as_dict(cls):
-        countries = {}
-        for my_country in cls.get_all():
-            countries[my_country.country_code] = my_country
-        return countries
+        locations = {}
+        for my_location in cls.get_all():
+            locations[my_location.location] = my_location
+        return locations
 
     @classmethod
     def get_by_id(cls, other_id):
diff --git a/src/flask_covid19/blueprints/data_rki_cases/rki_model_import.py b/src/flask_covid19/blueprints/data_rki_cases/rki_model_import.py
index bfe5896ddda3476cbeffa80e2ecb9995752b8f90..621d6de6016751d82c73198e91c34680f784ea6d 100644
--- a/src/flask_covid19/blueprints/data_rki_cases/rki_model_import.py
+++ b/src/flask_covid19/blueprints/data_rki_cases/rki_model_import.py
@@ -98,6 +98,13 @@ class RkiImport(db.Model):
             .order_by(cls.landkreis.asc()) \
             .all()
 
+    @classmethod
+    def find_by_datum(cls, datum: date):
+        db.session.query(cls) \
+            .filter(cls.datum == datum) \
+            .order_by(cls.landkreis.asc()) \
+            .all()
+
 
 class RkiFlat(db.Model):
     __tablename__ = 'rki_import_flat'
diff --git a/src/flask_covid19/blueprints/data_rki_cases/rki_service_update.py b/src/flask_covid19/blueprints/data_rki_cases/rki_service_update.py
index 28418048882f2587309cd934c2c16275f54b4a7d..2073bde7520746a58c273fb8a30de321023ca015 100644
--- a/src/flask_covid19/blueprints/data_rki_cases/rki_service_update.py
+++ b/src/flask_covid19/blueprints/data_rki_cases/rki_service_update.py
@@ -100,29 +100,28 @@ class RkiServiceUpdateFull(RkiServiceUpdateBase):
         app.logger.info("------------------------------------------------------------")
         RkiData.remove_all()
         i = 0
-        for datum_of_import in RkiImport.get_datum_of_all_import():
-            d = RkiMeldedatum.create_new_object_factory(my_date_rep=datum_of_import)
-            for result_item in RkiImport.find_by_datun(d.datum):
+        locations = RkiLandkreis.get_all_as_dict()
+        for d_meldedatum in RkiMeldedatum.get_all():
+            l_imports = RkiImport.find_by_datum(datum=d_meldedatum.datum)
+            for o_import in l_imports:
                 o = RkiData(
-                    object_id_1=int(result_item.OBJECTID_1),
-                    lan_ew_ags=int(result_item.LAN_ew_AGS),
-                    lan_ew_gen=result_item.LAN_ew_GEN,
-                    lan_ew_bez=result_item.LAN_ew_BEZ,
-                    lan_ew_ewz=int(result_item.LAN_ew_EWZ),
-                    object_id=int(result_item.OBJECTID),
-                    fallzahl=int(result_item.Fallzahl),
-                    aktualisierung=result_item.Aktualisierung,
-                    ags_txt=int(result_item.AGS_TXT),
-                    global_id=result_item.GlobalID, # uuid?
-                    faelle_100000_ew=float(result_item.faelle_100000_EW),
-                    death=int(result_item.Death),
-                    cases7_bl_per_100k=int(result_item.cases7_bl_per_100k),
-                    cases7_bl=int(result_item.cases7_bl),
-                    death7_bl=int(result_item.death7_bl),
-                    cases7_bl_per_100k_txt=result_item.cases7_bl_per_100k_txt,
-                    adm_unit_id=int(result_item.AdmUnitId),
-                    shape_length=float(result_item.SHAPE_Length),
-                    shape_area=float(result_item.SHAPE_Area),
+                    meldedatum=d_meldedatum,
+                    landkreis=locations[o_import.landkreis],
+                    fid=o_import.fid,
+                    altersgruppe=o_import.altersgruppe,
+                    geschlecht=o_import.geschlecht,
+                    anzahl_fall=o_import.anzahl_fall,
+                    anzahl_todesfall=o_import.anzahl_todesfall,
+                    datenstand=o_import.datenstand,
+                    neuer_fall=o_import.neuer_fall,
+                    neuer_todesfall=o_import.neuer_todesfall,
+                    ref_datum=o_import.ref_datum,
+                    neu_genesen=o_import.neu_genesen,
+                    anzahl_genesen=o_import.anzahl_genesen,
+                    ist_erkrankungsbeginn=o_import.ist_erkrankungsbeginn,
+                    altersgruppe2=o_import.altersgruppe2,
+                    processed_update=False,
+                    processed_full_update=True,
                 )
                 db.session.add(o)
                 i += 1