diff --git a/src/createFixedScansForGroup.js b/src/createFixedScansForGroup.js
index 0d298e2..3675c7a 100644
--- a/src/createFixedScansForGroup.js
+++ b/src/createFixedScansForGroup.js
@@ -1,8 +1,9 @@
-import { AuthService, OpenAPI, RunnerService, RunnerTeamService, ScanService } from "@odit/lfk-client-node";
+import { AuthService, OpenAPI, RunnerOrganizationService, RunnerService, RunnerTeamService, ScanService } from "@odit/lfk-client-node";
 import * as dotenv from 'dotenv';
 dotenv.config()
 
 const groupID = 3;
+const orgID = -1;
 const distanceMeter = 69;
 
 OpenAPI.BASE = process.env.BASE_URL;
@@ -17,13 +18,13 @@ const auth = await AuthService.authControllerLogin({ username: user, password })
 OpenAPI.TOKEN = auth.access_token;
 console.log("Logged in")
 
-const team = await RunnerTeamService.runnerTeamControllerGetOne(groupID);
-if (!team) {
-    process.exit(1)
-}
-
 const runners = await RunnerService.runnerControllerGetAll();
-const groupRunners = runners.filter((r) => r.group.id == team.id);
+let filteredRunners = [];
+if(groupID !== -1){
+    filteredRunners = runners.filter((r) => r.group.id == groupID);
+} else{
+    filteredRunners = runners.filter((r) => r.group.id == orgID || r.group.parentGroup?.id == orgID);
+}
 
 const scans = [];
 for (const runner of groupRunners) {