diff --git a/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml b/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml
index 8649e34a77f68c2f8b14b4619ce0fd4a616390fc..41da31e93a963155ec011a950a8c773f7703ce30 100644
--- a/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml
+++ b/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml
@@ -51,6 +51,14 @@ SPH:
   minimal_temperature:   100.0    # (internal units)
   initial_temperature:   268.7
 
+# Parameters for the Friends-Of-Friends algorithm
+FOF:
+  basename:                        fof_output  # Filename for the FOF outputs.
+  min_group_size:                  256         # The minimum no. of particles required for a group.
+  linking_length_ratio:            0.2         # Linking length in units of the main inter-particle separation.
+  black_hole_seed_halo_mass_Msun:  1.5e10      # Minimal halo mass in which to seed a black hole (in solar masses).
+  run_freq:                        256
+
 Scheduler:
   max_top_level_cells:   16
   cell_split_size:       100
@@ -154,6 +162,7 @@ EAGLEFeedback:
 
 # EAGLE AGN model
 EAGLEAGN:
+  subgrid_seed_mass_Msun:           1.5e5      # Black hole subgrid mass at creation time in solar masses.
   max_eddington_fraction:           1.         # Maximal allowed accretion rate in units of the Eddington rate.
   radiative_efficiency:             0.1        # Fraction of the accreted mass that gets radiated.
   coupling_efficiency:              0.15       # Fraction of the radiated energy that couples to the gas in feedback events.
diff --git a/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml b/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml
index c0e6ffe9aabf9d6ea84b034a81543e0b347e3cc5..cbdc44e8486d997ec0e45cc993565f0c9b865b15 100644
--- a/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml
+++ b/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml
@@ -51,6 +51,14 @@ SPH:
   minimal_temperature:   100.0    # (internal units)
   initial_temperature:   268.7
 
+# Parameters for the Friends-Of-Friends algorithm
+FOF:
+  basename:                        fof_output  # Filename for the FOF outputs.
+  min_group_size:                  256         # The minimum no. of particles required for a group.
+  linking_length_ratio:            0.2         # Linking length in units of the main inter-particle separation.
+  black_hole_seed_halo_mass_Msun:  1.5e10      # Minimal halo mass in which to seed a black hole (in solar masses).
+  run_freq:                        256
+
 Scheduler:
   max_top_level_cells:   16
   cell_split_size:       100
@@ -155,6 +163,7 @@ EAGLEFeedback:
 
 # EAGLE AGN model
 EAGLEAGN:
+  subgrid_seed_mass_Msun:           1.5e5      # Black hole subgrid mass at creation time in solar masses.
   max_eddington_fraction:           1.         # Maximal allowed accretion rate in units of the Eddington rate.
   radiative_efficiency:             0.1        # Fraction of the accreted mass that gets radiated.
   coupling_efficiency:              0.15       # Fraction of the radiated energy that couples to the gas in feedback events.
diff --git a/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml b/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml
index 082422ec6acba19acdc02c293a82b0fef3e0e23c..ebb2e37f048b455d4b8c4a3f08aa5943bc9ce13d 100644
--- a/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml
+++ b/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml
@@ -51,6 +51,14 @@ SPH:
   minimal_temperature:   100.0    # (internal units)
   initial_temperature:   268.7
 
+# Parameters for the Friends-Of-Friends algorithm
+FOF:
+  basename:                        fof_output  # Filename for the FOF outputs.
+  min_group_size:                  256         # The minimum no. of particles required for a group.
+  linking_length_ratio:            0.2         # Linking length in units of the main inter-particle separation.
+  black_hole_seed_halo_mass_Msun:  1.5e10      # Minimal halo mass in which to seed a black hole (in solar masses).
+  run_freq:                        256
+
 Scheduler:
   max_top_level_cells:   32
   cell_split_size:       100
@@ -155,6 +163,7 @@ EAGLEFeedback:
 
 # EAGLE AGN model
 EAGLEAGN:
+  subgrid_seed_mass_Msun:           1.5e5      # Black hole subgrid mass at creation time in solar masses.
   max_eddington_fraction:           1.         # Maximal allowed accretion rate in units of the Eddington rate.
   radiative_efficiency:             0.1        # Fraction of the accreted mass that gets radiated.
   coupling_efficiency:              0.15       # Fraction of the radiated energy that couples to the gas in feedback events.
diff --git a/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml b/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml
index d6ecfad02ae93d652cebb7d97933787e24d5ee16..951de51ca0df5d46f1f16aff6781918795da665e 100644
--- a/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml
+++ b/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml
@@ -53,14 +53,11 @@ SPH:
 
 # Parameters for the Friends-Of-Friends algorithm
 FOF:
-  basename:                 fof_output  # Common part of the name of output files
-  run_freq:                  50
-  min_group_size:           256         # (Optional) The minimum no. of particles required for a group. Defaults to 20 if unspecified.
-  linking_length_scale:     0.2         # (Optional) Scales the linking length. Defaults to 0.2 if unspecified.
-  group_links_size_default: 20000       # (Optional) Sets the initial size of the group_links array, which is used to store links across MPI domains. Defaults to 20000 if unspecified.
-  group_id_default:         2147483647  # (Optional) Sets the group ID of particles in groups below the minimum size. Defaults to 2^31 - 1 if unspecified. Has to be positive.
-  group_id_offset:          1           # (Optional) Sets the offset of group ID labeling. Defaults to 1 if unspecified.
-  #absolute_linking_length: 0.2         # (Optional) Sets an absolute linking length. Defaults to mean inter-particle spacing * linking_length_scale if unspecified.
+  basename:                        fof_output  # Filename for the FOF outputs.
+  min_group_size:                  256         # The minimum no. of particles required for a group.
+  linking_length_ratio:            0.2         # Linking length in units of the main inter-particle separation.
+  black_hole_seed_halo_mass_Msun:  1.5e10      # Minimal halo mass in which to seed a black hole (in solar masses).
+  run_freq:                        256
 
 # Parameters related to the initial conditions
 InitialConditions:
@@ -69,10 +66,6 @@ InitialConditions:
   cleanup_h_factors: 1               # Remove the h-factors inherited from Gadget
   cleanup_velocity_factors: 1        # Remove the sqrt(a) factor in the velocities inherited from Gadget
 
-EAGLEBlackHoles:
-  seed_halo_mass:            1.5
-  
-
 EAGLEChemistry: 	     # Solar abundances
   init_abundance_metal:      0.014
   init_abundance_Hydrogen:   0.70649785
@@ -158,6 +151,7 @@ EAGLEFeedback:
 
 # EAGLE AGN model
 EAGLEAGN:
+  subgrid_seed_mass_Msun:           1.5e5      # Black hole subgrid mass at creation time in solar masses.
   max_eddington_fraction:           1.         # Maximal allowed accretion rate in units of the Eddington rate.
   radiative_efficiency:             0.1        # Fraction of the accreted mass that gets radiated.
   coupling_efficiency:              0.15       # Fraction of the radiated energy that couples to the gas in feedback events.
diff --git a/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml b/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml
index a13925e6079ce2aeec3adbdef9a46040fd87677b..720f344c1b761dbcbe0392216e4b789f1b6962cb 100644
--- a/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml
+++ b/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml
@@ -60,13 +60,11 @@ SPH:
 
 # Parameters for the Friends-Of-Friends algorithm
 FOF:
-  basename:                 fof_output  # Common part of the name of output files
-  min_group_size:           20          # (Optional) The minimum no. of particles required for a group. Defaults to 20 if unspecified.
-  linking_length_scale:     0.2         # (Optional) Scales the linking length. Defaults to 0.2 if unspecified.
-  group_links_size_default: 20000       # (Optional) Sets the initial size of the group_links array, which is used to store links across MPI domains. Defaults to 20000 if unspecified.
-  group_id_default:         2147483647  # (Optional) Sets the group ID of particles in groups below the minimum size. Defaults to 2^31 - 1 if unspecified. Has to be positive.
-  group_id_offset:          1           # (Optional) Sets the offset of group ID labeling. Defaults to 1 if unspecified.
-  #absolute_linking_length: 0.2         # (Optional) Sets an absolute linking length. Defaults to mean inter-particle spacing * linking_length_scale if unspecified.
+  basename:                        fof_output  # Filename for the FOF outputs.
+  min_group_size:                  256         # The minimum no. of particles required for a group.
+  linking_length_ratio:            0.2         # Linking length in units of the main inter-particle separation.
+  black_hole_seed_halo_mass_Msun:  1.5e10      # Minimal halo mass in which to seed a black hole (in solar masses).
+  run_freq:                        256
 
 # Parameters related to the initial conditions
 InitialConditions:
@@ -160,6 +158,7 @@ EAGLEFeedback:
 
 # EAGLE AGN model
 EAGLEAGN:
+  subgrid_seed_mass_Msun:           1.5e5      # Black hole subgrid mass at creation time in solar masses.
   max_eddington_fraction:           1.         # Maximal allowed accretion rate in units of the Eddington rate.
   radiative_efficiency:             0.1        # Fraction of the accreted mass that gets radiated.
   coupling_efficiency:              0.15       # Fraction of the radiated energy that couples to the gas in feedback events.
diff --git a/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml b/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml
index 06e47d45335380de2abd7edd3017043d735f352a..bed82619414415f8e63782e09e8daed62b2da073 100644
--- a/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml
+++ b/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml
@@ -55,14 +55,11 @@ SPH:
 
 # Parameters for the Friends-Of-Friends algorithm
 FOF:
-  basename:                 fof_output  # Common part of the name of output files
-  run_freq:                 2000        # (Optional) The no. of steps between each FOF search. Defaults to 2000.
-  min_group_size:           20          # (Optional) The minimum no. of particles required for a group. Defaults to 20 if unspecified.
-  linking_length_scale:     0.2         # (Optional) Scales the linking length. Defaults to 0.2 if unspecified.
-  group_links_size_default: 20000       # (Optional) Sets the initial size of the group_links array, which is used to store links across MPI domains. Defaults to 20000 if unspecified.
-  group_id_default:         2147483647  # (Optional) Sets the group ID of particles in groups below the minimum size. Defaults to 2^31 - 1 if unspecified. Has to be positive.
-  group_id_offset:          1           # (Optional) Sets the offset of group ID labeling. Defaults to 1 if unspecified.
-  #absolute_linking_length: 0.2         # (Optional) Sets an absolute linking length. Defaults to mean inter-particle spacing * linking_length_scale if unspecified.
+  basename:                        fof_output  # Filename for the FOF outputs.
+  min_group_size:                  256         # The minimum no. of particles required for a group.
+  linking_length_ratio:            0.2         # Linking length in units of the main inter-particle separation.
+  black_hole_seed_halo_mass_Msun:  1.5e10      # Minimal halo mass in which to seed a black hole (in solar masses).
+  run_freq:                        256
 
 # Parameters related to the initial conditions
 InitialConditions:
@@ -71,10 +68,6 @@ InitialConditions:
   cleanup_h_factors: 1                # Remove the h-factors inherited from Gadget
   cleanup_velocity_factors: 1         # Remove the sqrt(a) factor in the velocities inherited from Gadget
 
-# EAGLE black hole seeding parameters
-EAGLEBlackHoles:
-  seed_halo_mass:   1.5e10 # The minimum group mass required for black hole seeding
-
 EAGLEChemistry: 	     # Solar abundances
   init_abundance_metal:      0.014
   init_abundance_Hydrogen:   0.70649785
@@ -160,6 +153,7 @@ EAGLEFeedback:
 
 # EAGLE AGN model
 EAGLEAGN:
+  subgrid_seed_mass_Msun:           1.5e5      # Black hole subgrid mass at creation time in solar masses.
   max_eddington_fraction:           1.         # Maximal allowed accretion rate in units of the Eddington rate.
   radiative_efficiency:             0.1        # Fraction of the accreted mass that gets radiated.
   coupling_efficiency:              0.15       # Fraction of the radiated energy that couples to the gas in feedback events.
diff --git a/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml b/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml
index c03f11b81c700515ce723d70ed9fc3ce11557109..556276f326912303de1af6d13db1f4b6f19b7f95 100644
--- a/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml
+++ b/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml
@@ -80,10 +80,6 @@ InitialConditions:
   cleanup_h_factors: 1               # Remove the h-factors inherited from Gadget
   cleanup_velocity_factors: 1        # Remove the sqrt(a) factor in the velocities inherited from Gadget
 
-# EAGLE black hole seeding parameters
-EAGLEBlackHoles:
-  seed_halo_mass:   1.5e10 # The minimum group mass required for black hole seeding
-
 EAGLEChemistry: 	     # Solar abundances
   init_abundance_metal:      0.014
   init_abundance_Hydrogen:   0.70649785