diff --git a/sumo_project/emissions.py b/sumo_project/emissions.py
index 390c280..0ecbfe2 100644
--- a/sumo_project/emissions.py
+++ b/sumo_project/emissions.py
@@ -1,8 +1,9 @@
-import traci
-import config
+from typing import List
 
-from SUMOFactory import SUMOFactory
-from model import Area
+import traci
+
+import config
+from model import Area, Vehicle
 
 
 def init_grid(simulation_bounds, cells_number):
@@ -22,20 +23,24 @@ def init_grid(simulation_bounds, cells_number):
     return areas
 
 
-def emission_for_area(area):
-    # retrieve all vehicles into this area
+def get_all_vehicles() -> List[Vehicle]:
+    vehicles = list()
     for veh_id in traci.vehicle.getIDList():
-        pos = traci.vehicle.getPosition(veh_id)
-        if pos in area:
-            area.emissions += traci.vehicle.getCO2Emission(veh_id)
+        veh_pos = traci.vehicle.getPosition(veh_id)
+        vehicle = Vehicle(veh_id, veh_pos)
+        vehicle.co2 = traci.vehicle.getCO2Emission(vehicle.id)
+        vehicles.append(vehicle)
+    return vehicles
 
 
-def get_emissions(areas, factory):
-    for area in areas:
-        emission_for_area(area)
+def get_emissions(grid: List[Area], vehicles: List[Vehicle]):
+    for area in grid:
+        for vehicle in vehicles:
+            if vehicle.pos in area:
+                area.emissions += vehicle.co2
         if area.emissions > config.CO2_THRESHOLD:
             # print(f'Threshold exceeded in {area.name} : {area.emissions}')
-            factory.lock_area(area)
+            # factory.lock_area(area)
             traci.polygon.setColor(area.name, (255, 0, 0))
             traci.polygon.setFilled(area.name, True)
 
@@ -46,7 +51,9 @@ def main():
         grid = init_grid(traci.simulation.getNetBoundary(), config.CELLS_NUMBER)
         while traci.simulation.getMinExpectedNumber() > 0:
             traci.simulationStep()
-            get_emissions(grid, SUMOFactory())
+            # get_emissions(grid, SUMOFactory())
+            vehicles = get_all_vehicles()
+            get_emissions(grid, vehicles)
     finally:
         traci.close(False)
 
diff --git a/sumo_project/model.py b/sumo_project/model.py
index b552aee..541e3c1 100644
--- a/sumo_project/model.py
+++ b/sumo_project/model.py
@@ -1,5 +1,7 @@
-from shapely.geometry import Polygon
+from typing import Tuple
+
 from shapely.geometry import Point
+from shapely.geometry import Polygon
 
 
 class Area:
@@ -13,7 +15,7 @@ class Area:
         return self.rectangle.__eq__(other)
 
     def __contains__(self, item):
-        return self.rectangle.contains(Point(item))
+        return self.rectangle.contains(item)
 
     @property
     def bounds(self):
@@ -26,3 +28,13 @@ class Area:
             (xmin, ymax),
             (xmax, ymax),
             (xmax, ymin)))
+
+
+class Vehicle:
+
+    def __init__(self, id: int, pos: Tuple[float, float]):
+        self.id = id
+        self.pos = Point(pos)
+
+    def __repr__(self) -> str:
+        return str(self.__dict__)