diff --git a/main.py b/main.py
index c813f9a..595e385 100644
--- a/main.py
+++ b/main.py
@@ -1693,18 +1693,17 @@ async def fastapi_generate_virtual_district(network: str, centers: list[str]) ->
 ############################################################
 # water_distribution_area 36
 ############################################################
+@app.get('/calculatedemandtonodes/')
+async def fastapi_calculate_demand_to_nodes(network: str, demand: float, nodes: list[str]) -> dict[str, float]:
+    return calculate_demand_to_nodes(network, demand, nodes)
 
-def calculate_demand_to_nodes(name: str, demand: float, nodes: list[str]) -> dict[str, float]:
-    return api.calculate_demand_to_nodes(name, demand, nodes)
+@app.get('/calculatedemandtoregion/')
+async def fastapi_calculate_demand_to_region(network: str, demand: float, region: str) -> dict[str, float]:
+    return calculate_demand_to_region(network, demand, region)
 
-# if region is general or wda => get_nodes_in_boundary
-# if region is dma, sa or vd  => get stored nodes in table
-# TODO: more test
-def calculate_demand_to_region(name: str, demand: float, region: str) -> dict[str, float]:
-    return api.calculate_demand_to_region(name, demand, region)
-
-def calculate_demand_to_network(name: str, demand: float) -> dict[str, float]:
-    return api.calculate_demand_to_network(name, demand)
+@app.get('/calculatedemandtonetwork/')
+async def fastapi_calculate_demand_to_network(network: str, demand: float) -> dict[str, float]:
+    return calculate_demand_to_network(network, demand)