diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index a48398d75f..3b60dfda7f 100644
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -104770,33 +104770,6 @@ entities:
         temporary: False
         event: !type:ToggleActionEvent {}
       type: HandheldLight
-  - uid: 1773
-    components:
-    - pos: -27.432951,43.824997
-      parent: 30
-      type: Transform
-    - toggleAction:
-        sound: null
-        itemIconStyle: BigItem
-        icon:
-          sprite: Objects/Tools/flashlight.rsi
-          state: flashlight
-        iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
-        iconColor: '#FFFFFFFF'
-        name: action-name-toggle-light
-        description: action-description-toggle-light
-        keywords: []
-        enabled: True
-        useDelay: null
-        charges: null
-        checkCanInteract: True
-        clientExclusive: False
-        priority: 0
-        autoPopulate: True
-        autoRemove: True
-        temporary: False
-        event: !type:ToggleActionEvent {}
-      type: HandheldLight
   - uid: 4953
     components:
     - pos: -22.461006,36.440132
@@ -105007,6 +104980,13 @@ entities:
     - pos: -28.479252,15.714678
       parent: 30
       type: Transform
+- proto: LampInterrogator
+  entities:
+  - uid: 1773
+    components:
+    - pos: -27.415504,43.902733
+      parent: 30
+      type: Transform
 - proto: lantern
   entities:
   - uid: 17958
@@ -105543,6 +105523,13 @@ entities:
         - 0
         - 0
       type: EntityStorage
+- proto: LockerEngineerFilledHardsuit
+  entities:
+  - uid: 20804
+    components:
+    - pos: -15.5,-38.5
+      parent: 30
+      type: Transform
 - proto: LockerEvidence
   entities:
   - uid: 2248
@@ -123986,6 +123973,16 @@ entities:
       type: Transform
 - proto: SpawnPointMedicalIntern
   entities:
+  - uid: 20800
+    components:
+    - pos: -22.5,-18.5
+      parent: 30
+      type: Transform
+  - uid: 20801
+    components:
+    - pos: -21.5,-18.5
+      parent: 30
+      type: Transform
   - uid: 20887
     components:
     - pos: -24.5,-18.5
@@ -124038,6 +124035,11 @@ entities:
     - pos: 21.5,11.5
       parent: 30
       type: Transform
+  - uid: 20793
+    components:
+    - pos: 22.5,8.5
+      parent: 30
+      type: Transform
   - uid: 22455
     components:
     - pos: 21.5,10.5
@@ -124079,11 +124081,6 @@ entities:
     - pos: 22.5,10.5
       parent: 30
       type: Transform
-  - uid: 20991
-    components:
-    - pos: 22.5,8.5
-      parent: 30
-      type: Transform
   - uid: 21185
     components:
     - pos: 22.5,9.5
@@ -124091,6 +124088,16 @@ entities:
       type: Transform
 - proto: SpawnPointSecurityCadet
   entities:
+  - uid: 20798
+    components:
+    - pos: -31.5,57.5
+      parent: 30
+      type: Transform
+  - uid: 20799
+    components:
+    - pos: -34.5,57.5
+      parent: 30
+      type: Transform
   - uid: 20891
     components:
     - pos: -32.5,57.5
@@ -124123,6 +124130,34 @@ entities:
     - pos: -31.5,59.5
       parent: 30
       type: Transform
+- proto: SpawnPointSeniorEngineer
+  entities:
+  - uid: 20795
+    components:
+    - pos: -23.5,-40.5
+      parent: 30
+      type: Transform
+- proto: SpawnPointSeniorOfficer
+  entities:
+  - uid: 20797
+    components:
+    - pos: -28.5,59.5
+      parent: 30
+      type: Transform
+- proto: SpawnPointSeniorPhysician
+  entities:
+  - uid: 20796
+    components:
+    - pos: -25.5,-18.5
+      parent: 30
+      type: Transform
+- proto: SpawnPointSeniorResearcher
+  entities:
+  - uid: 20794
+    components:
+    - pos: 21.5,12.5
+      parent: 30
+      type: Transform
 - proto: SpawnPointServiceWorker
   entities:
   - uid: 20889
@@ -124159,6 +124194,16 @@ entities:
       type: Transform
 - proto: SpawnPointTechnicalAssistant
   entities:
+  - uid: 20802
+    components:
+    - pos: -21.5,-42.5
+      parent: 30
+      type: Transform
+  - uid: 20803
+    components:
+    - pos: -21.5,-41.5
+      parent: 30
+      type: Transform
   - uid: 20885
     components:
     - pos: -22.5,-42.5
diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml
index e8c0f23a4b..1ef272d113 100644
--- a/Resources/Prototypes/Maps/marathon.yml
+++ b/Resources/Prototypes/Maps/marathon.yml
@@ -19,37 +19,48 @@
           overflowJobs:
             - Passenger
           availableJobs:
-            CargoTechnician: [ 2, 3 ]
-            Passenger: [ -1, -1 ]
-            Bartender: [ 2, 2 ]
-            Botanist: [ 3, 3]
-            Chef: [ 2, 2 ]
-            Clown: [ 1, 1 ]
-            Janitor: [ 1, 2 ]
-            Mime: [ 1, 1 ]
+            #service
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
-            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 4, 6 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 3, 4 ]
-            Chemist: [ 2, 3 ]
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 3, 4 ]
-            HeadOfSecurity: [ 1, 1 ]
-            SecurityOfficer: [ 4, 4 ]
+            Bartender: [ 2, 2 ]
+            Botanist: [ 2, 3 ]
+            Chef: [ 2, 2 ]
+            Janitor: [ 1, 2 ]
             Chaplain: [ 1, 1 ]
-            Warden: [ 1, 1 ]
             Librarian: [ 1, 1 ]
+            ServiceWorker: [ 2, 2 ]
+            #engineering
+            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
+            AtmosphericTechnician: [ 3, 3 ]
+            StationEngineer: [ 3, 3 ]
+            TechnicalAssistant: [ 3, 3 ]
+            #medical
+            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
+            Chemist: [ 3, 3 ]
+            MedicalDoctor: [ 3, 3 ]
+            MedicalIntern: [ 3, 3 ]
+            Psychologist: [ 1, 1 ]
+            #science
+            ResearchDirector: [ 1, 1 ]
+            SeniorResearcher: [ 1, 1 ]        
+            Scientist: [ 3, 3 ]
+            ResearchAssistant: [ 3, 3 ] 
+            #security
+            HeadOfSecurity: [ 1, 1 ]
+            Warden: [ 1, 1 ]
+            SeniorOfficer: [ 1, 1 ]
+            SecurityOfficer: [ 3, 3 ]
+            Detective: [ 1, 1 ]
+            SecurityCadet: [ 4, 4 ]
             Lawyer: [ 2, 2 ]
+            #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
+            CargoTechnician: [ 3, 3 ]
+            #civilian
+            Passenger: [ -1, -1 ]
+            Clown: [ 1, 1 ]
+            Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            AtmosphericTechnician: [ 3, 3 ]
-            TechnicalAssistant: [ 4, 4 ]
-            MedicalIntern: [ 4, 4 ]
-            ServiceWorker: [ 2, 2 ]
-            SecurityCadet: [ 4, 4 ]
-            Psychologist: [ 1, 1 ]
-            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 4, 4 ]