diff --git a/src/in-situ/camsFormatter.py b/src/in-situ/camsFormatter.py
index afd437bd2238c87e0d7849a16ef6871125ab5151..3382a3145707b90d4ad1503ff57e654975aedb3b 100755
--- a/src/in-situ/camsFormatter.py
+++ b/src/in-situ/camsFormatter.py
@@ -143,13 +143,6 @@ def read_and_process_data(iDate, fDate, dataDir, elements, an_re, unit, remove_c
 
         # Create a countries column to cut later
         df["COUNTRY"] = [station[:2] for station in df["STATION"]]
-        # Remove countries if they are in remove countries list
-        print("REMOVING COUNTRIES: {}".format(remove_countries))
-        print(len(df))
-        df = df[~df["COUNTRY"].isin(remove_countries)]
-        print(len(df))
-        # Save the index of the data removed
-        index_removed = df[df["COUNTRY"].isin(remove_countries)].index
 
 
         # Add all observational events for each specific date and element
@@ -159,6 +152,17 @@ def read_and_process_data(iDate, fDate, dataDir, elements, an_re, unit, remove_c
                 print(date)
                 cut_df = df[(df.element_con == e) & (df.date == date)]
 
+                try:
+                    countries_by_element = remove_countries[e]
+                except:
+                    print("No countries for that element")
+                    countries_by_element = []
+                print(countries_by_element)
+
+                print("Removing {} countries for element: {}".format(countries_by_element, e))
+                cut_df = cut_df[~cut_df["COUNTRY"].isin(countries_by_element)]
+
+
 
                 # Apply boundaries for the values
                 cut_df = cut_df[cut_df['CONCENTRATION'].between(
diff --git a/src/in-situ/elwriterdaf90.cpython-37m-x86_64-linux-gnu.so b/src/in-situ/elwriterdaf90.cpython-37m-x86_64-linux-gnu.so
index d58c8adaf9aa60ff00300f296091e0b36db306d8..deb3eaa51ef79bf0d51697d2406e53229b214b12 100755
Binary files a/src/in-situ/elwriterdaf90.cpython-37m-x86_64-linux-gnu.so and b/src/in-situ/elwriterdaf90.cpython-37m-x86_64-linux-gnu.so differ
diff --git a/src/in-situ/run_nord3.sh b/src/in-situ/run_nord3.sh
index c6f6e48efb88293e3863fb8366f26220a11b92cb..fb1e41de06eeca589d9fa7b9b62a89f0f88ffa7b 100755
--- a/src/in-situ/run_nord3.sh
+++ b/src/in-situ/run_nord3.sh
@@ -57,7 +57,7 @@ southbound='-27.0'
 uncb='{"O3":0.01,"CO":0.01,"NO2":0.005,"SO2":0.005,"PM10":0.0001,"PM25":0.0005}'
 uncc='{"O3":0.001,"CO":0.001,"NO2":0.005,"SO2":0.0005,"PM10":0.00001,"PM25":0.00005}'
 
-remove_countries='["RO"]'
+remove_countries='{"CO":["RO"]}'
 
 #start date