diff --git a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua
index 3508d02..ed02aff 100644
--- a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua
+++ b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua
@@ -170,20 +170,20 @@ data:extend({
         production_type = "input",
         pipe_picture = assembler3pipepictures(),
         pipe_covers = pipecoverspictures(),
-        base_area = 10,
+        volume = 1000,
         base_level = -1,
-        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {-1, -5} }}
+        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {-1, -4} }}
       },
       {
         production_type = "input",
         pipe_picture = assembler3pipepictures(),
         pipe_covers = pipecoverspictures(),
-        base_area = 10,
+        volume = 1000,
         base_level = -1,
-        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {1, -5} }}
+        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {1, -4} }}
       },
-      off_when_no_fluid_recipe = true
     },
+    fluid_boxes_off_when_no_fluid_recipe = true,
 
     collision_box = {{-4.2, -4.2}, {4.2, 4.2}},
     selection_box = {{-4.5, -4.5}, {4.5, 4.5}},
@@ -453,9 +453,9 @@ data:extend({
         production_type = "input",
         pipe_picture = assembler3pipepictures(),
         pipe_covers = pipecoverspictures(),
-        base_area = 10,
+        volume = 1000,
         base_level = -1,
-        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {0, -2} }}
+        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {0, -1} }}
       },
     },
     module_specification = {
@@ -967,20 +967,20 @@ data:extend({
         production_type = "input",
         pipe_picture = assembler3pipepictures(),
         pipe_covers = pipecoverspictures(),
-        base_area = 10,
+        volume = 1000,
         base_level = -1,
-        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {-1, -5} }}
+        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {-1, -4} }}
       },
       {
         production_type = "input",
         pipe_picture = assembler3pipepictures(),
         pipe_covers = pipecoverspictures(),
-        base_area = 10,
+        volume = 1000,
         base_level = -1,
-        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {1, -5} }}
+        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {1, -4} }}
       },
-      off_when_no_fluid_recipe = true
     },
+    fluid_boxes_off_when_no_fluid_recipe = true,
     collision_box = {{-4.2, -4.2}, {4.2, 4.2}},
     selection_box = {{-4.5, -4.5}, {4.5, 4.5}},
     order = "x[bi]-a[bi-arboretum]",
diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua b/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua
index 21d70a3..b53f4ab 100644
--- a/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua
+++ b/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua
@@ -36,44 +36,44 @@ data:extend({
         production_type = "input",
         pipe_picture = assembler2pipepicturesBioreactor(),
         pipe_covers = pipecoverspicturesBioreactor(),
-        base_area = 10,
+        volume = 1000,
         base_level = -1,
-        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {0, -2} }}
+        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {0, -1} }}
       },
       {
         production_type = "input",
         pipe_picture = assembler2pipepicturesBioreactor(),
         pipe_covers = pipecoverspicturesBioreactor(),
-        base_area = 10,
+        volume = 1000,
         base_level = -1,
-        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {2, 0} }}
+        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {1, 0} }}
       },
       {
         production_type = "input",
         pipe_picture = assembler2pipepicturesBioreactor(),
         pipe_covers = pipecoverspicturesBioreactor(),
-        base_area = 10,
+        volume = 1000,
         base_level = -1,
-        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {0, 2} }}
+        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {0, 1} }}
       },
       {
         production_type = "output",
         pipe_picture = assembler2pipepicturesBioreactor(),
         pipe_covers = pipecoverspicturesBioreactor(),
-        base_area = 10,
+        volume = 1000,
         base_level = 1,
-        pipe_connections = {{ flow_direction = "output", direction = defines.direction.north, position = {-2, -1} }}
+        pipe_connections = {{ flow_direction = "output", direction = defines.direction.north, position = {-1, -1} }}
       },
       {
         production_type = "output",
         pipe_picture = assembler2pipepicturesBioreactor(),
         pipe_covers = pipecoverspicturesBioreactor(),
-        base_area = 10,
+        volume = 1000,
         base_level = 1,
-        pipe_connections = {{ flow_direction = "output", direction = defines.direction.north, position = {-2, 1} }}
+        pipe_connections = {{ flow_direction = "output", direction = defines.direction.north, position = {-1, 1} }}
       },
-      off_when_no_fluid_recipe = false
     },
+    fluid_boxes_off_when_no_fluid_recipe = true,
     collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
     selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
     animation = {
@@ -143,24 +143,22 @@ if BI.Settings.BI_Bio_Fuel then
       selection_box = {{-1.5, -1}, {1.5, 1}},
       target_temperature = 165,
       fluid_box = {
-        base_area = 1,
-        height = 2,
+        volume = 200,
         base_level = -1,
         pipe_covers = pipecoverspictures(),
         pipe_connections = {
-          {flow_direction = "input-output", direction = defines.direction.north, position = {-2, 0.5}},
-          {flow_direction = "input-output", direction = defines.direction.north, position = {2, 0.5}}
+          {flow_direction = "input-output", direction = defines.direction.north, position = {-1, 0.5}},
+          {flow_direction = "input-output", direction = defines.direction.north, position = {1, 0.5}}
         },
         production_type = "input-output",
         filter = "water"
       },
       output_fluid_box = {
-        base_area = 1,
-        height = 2,
+        volume = 200,
         base_level = 1,
         pipe_covers = pipecoverspictures(),
         pipe_connections = {
-          {flow_direction = "output", direction = defines.direction.north, position = {0, -1.5}}
+          {flow_direction = "output", direction = defines.direction.north, position = {0, -0.5}}
         },
         production_type = "output",
         filter = "steam"
diff --git a/Bio_Industries_2/prototypes/Bio_Garden/entities.lua b/Bio_Industries_2/prototypes/Bio_Garden/entities.lua
index ebc9a78..8253d48 100644
--- a/Bio_Industries_2/prototypes/Bio_Garden/entities.lua
+++ b/Bio_Industries_2/prototypes/Bio_Garden/entities.lua
@@ -30,12 +30,12 @@ data:extend({
         production_type = "input",
         pipe_picture = assembler3pipepictures(),
         pipe_covers = pipecoverspictures(),
-        base_area = 10,
+        volume = 1000,
         base_level = -1,
-        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {0, -2} }}
+        pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {0, -1} }}
       },
-      off_when_no_fluid_recipe = true
     },
+    fluid_boxes_off_when_no_fluid_recipe = true,
     animation = {
       filename = "__Bio_Industries_2__/graphics/entities/biogarden/bio_garden_x.png",
       width = 160,
diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua
index 10064bb..5dbf5d6 100644
--- a/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua
+++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua
@@ -326,25 +326,23 @@ data:extend({
     selection_box = {{-4.5, -4.5}, {4.5, 4.5}},
     target_temperature = 235,
     fluid_box = {
-      base_area = 1,
-      height = 2,
+      volume = 200,
       base_level = -1,
       pipe_covers = pipecoverspictures(),
       pipe_connections = {
-        {flow_direction = "input-output", direction = defines.direction.north, position = {5, 0}},
-                {flow_direction = "input-output", direction = defines.direction.north, position = {-5, 0}},
+        {flow_direction = "input-output", direction = defines.direction.north, position = {4, 0}},
+                {flow_direction = "input-output", direction = defines.direction.north, position = {-4, 0}},
       },
       production_type = "input-output",
       filter = "water"
     },
     output_fluid_box = {
-      base_area = 1,
-      height = 2,
+      volume = 200,
       base_level = 1,
       pipe_covers = pipecoverspictures(),
       pipe_connections = {
-       {flow_direction = "input-output", direction = defines.direction.north, position = {0, 5}},
-           {flow_direction = "input-output", direction = defines.direction.north, position = {0, -5}},
+       {flow_direction = "input-output", direction = defines.direction.north, position = {0, 4}},
+           {flow_direction = "input-output", direction = defines.direction.north, position = {0, -4}},
       },
       production_type = "output",
       filter = "steam"
diff --git a/Bio_Industries_2/prototypes/Wood_Products/entities.lua b/Bio_Industries_2/prototypes/Wood_Products/entities.lua
index 8ef5eb9..afce637 100644
--- a/Bio_Industries_2/prototypes/Wood_Products/entities.lua
+++ b/Bio_Industries_2/prototypes/Wood_Products/entities.lua
@@ -739,12 +739,12 @@ data:extend({
     collision_box = {{-0.29, -0.29}, {0.29, 0.29}},
     selection_box = {{-0.5, -0.5}, {0.5, 0.5}},
     fluid_box = {
-      base_area = 1,
+      volume = 100,
       pipe_connections = {
-        { position = {0, -1} },
-        { position = {1, 0} },
-        { position = {0, 1} },
-        { position = {-1, 0} }
+        { direction = defines.direction.north, position = {0, 0} },
+        { direction = defines.direction.east, position = {0, 0} },
+        { direction = defines.direction.south, position = {0, 0} },
+        { direction = defines.direction.west, position = {0, 0} }
       },
     },
     pictures = pipepictures_w(),
@@ -794,12 +794,14 @@ data:extend({
     collision_box = {{-0.29, -0.29}, {0.29, 0.2}},
     selection_box = {{-0.5, -0.5}, {0.5, 0.5}},
     fluid_box = {
-      base_area = 1,
+      volume = 100,
       pipe_covers = pipecoverspictures(),
       pipe_connections = {
-        { position = {0, -1} },
+        { direction = defines.direction.north, position = {0, 0} },
         {
-          position = {0, 1},
+          direction = defines.direction.south,
+          position = {0, 0},
+          connection_type = "underground",
           max_underground_distance = 10
         }
       },