diff --git a/gqueries/general/electricity/power_shortage/power_shortage_hours.gql b/gqueries/general/electricity/power_shortage/power_shortage_hours.gql
new file mode 100644
index 0000000000..1eb942d30e
--- /dev/null
+++ b/gqueries/general/electricity/power_shortage/power_shortage_hours.gql
@@ -0,0 +1,7 @@
+- query =
+    IF(
+      GRAPH().future?,
+      -> { V(GRAPH(), number_of_power_shortage_hours) },
+      -> { 0 }
+    )
+- unit = hours
diff --git a/gqueries/general/electricity/power_shortage/power_shortage_peak.gql b/gqueries/general/electricity/power_shortage/power_shortage_peak.gql
new file mode 100644
index 0000000000..ca5cfc176e
--- /dev/null
+++ b/gqueries/general/electricity/power_shortage/power_shortage_peak.gql
@@ -0,0 +1,7 @@
+- query =
+    IF(
+      GRAPH().future?,
+      -> { V(GRAPH(), peak_of_power_shortage_hours) },
+      -> { 0 }
+    )
+- unit = MW
diff --git a/gqueries/general/electricity/power_shortage/power_shortage_volume.gql b/gqueries/general/electricity/power_shortage/power_shortage_volume.gql
new file mode 100644
index 0000000000..ccbd8c2548
--- /dev/null
+++ b/gqueries/general/electricity/power_shortage/power_shortage_volume.gql
@@ -0,0 +1,16 @@
+# The "volume_of_power_shortage_hours" method returns the blackouts in MWh.
+# This needs to be refactored to PJ.
+
+- query =
+    DIVIDE(
+      PRODUCT(
+        IF(
+          GRAPH().future?,
+          -> { V(GRAPH(), volume_of_power_shortage_hours) },
+          -> { 0 }
+        ),
+        MWH_TO_GJ
+      ),
+      MILLIONS
+    )
+- unit = PJ
diff --git a/gqueries/general/electricity/power_shortage/total_electricity_demand_peak.gql b/gqueries/general/electricity/power_shortage/total_electricity_demand_peak.gql
new file mode 100644
index 0000000000..169206b1c6
--- /dev/null
+++ b/gqueries/general/electricity/power_shortage/total_electricity_demand_peak.gql
@@ -0,0 +1,2 @@
+- query = MAX(Q(electricity_demand_total_curve))
+- unit = MW
diff --git a/gqueries/general/electricity/power_shortage/total_electricity_demand_volume.gql b/gqueries/general/electricity/power_shortage/total_electricity_demand_volume.gql
new file mode 100644
index 0000000000..b73c005825
--- /dev/null
+++ b/gqueries/general/electricity/power_shortage/total_electricity_demand_volume.gql
@@ -0,0 +1,11 @@
+- query =
+    DIVIDE(
+      PRODUCT(
+        SUM(
+          Q(electricity_demand_total_curve)
+        ),
+        MWH_TO_GJ
+      ),
+      MILLIONS
+    )
+- unit = PJ
diff --git a/gqueries/output_elements/dashboard/dashboard_blackout_hours.gql b/gqueries/output_elements/dashboard/dashboard_blackout_hours.gql
deleted file mode 100644
index 28efd14d01..0000000000
--- a/gqueries/output_elements/dashboard/dashboard_blackout_hours.gql
+++ /dev/null
@@ -1,6 +0,0 @@
-- query =
-    IF(
-      GRAPH().future?,
-      -> { V(GRAPH(), number_of_blackout_hours) },
-      -> { 0 }
-    )
diff --git a/gqueries/output_elements/dashboard/dashboard_power_shortage_hours.gql b/gqueries/output_elements/dashboard/dashboard_power_shortage_hours.gql
new file mode 100644
index 0000000000..cab5f07f03
--- /dev/null
+++ b/gqueries/output_elements/dashboard/dashboard_power_shortage_hours.gql
@@ -0,0 +1,2 @@
+- query = Q(power_shortage_hours)
+- unit = hours
diff --git a/gqueries/output_elements/output_series/mekko_of_electricity_network/supply_of_blackouts_for_electricity_network_mekko.gql b/gqueries/output_elements/output_series/mekko_of_electricity_network/supply_of_power_shortage_for_electricity_network_mekko.gql
similarity index 100%
rename from gqueries/output_elements/output_series/mekko_of_electricity_network/supply_of_blackouts_for_electricity_network_mekko.gql
rename to gqueries/output_elements/output_series/mekko_of_electricity_network/supply_of_power_shortage_for_electricity_network_mekko.gql
diff --git a/gqueries/output_elements/output_series/table_power_shortage/dashboard_power_shortage_amount_of_hours.gql b/gqueries/output_elements/output_series/table_power_shortage/dashboard_power_shortage_amount_of_hours.gql
new file mode 100644
index 0000000000..cab5f07f03
--- /dev/null
+++ b/gqueries/output_elements/output_series/table_power_shortage/dashboard_power_shortage_amount_of_hours.gql
@@ -0,0 +1,2 @@
+- query = Q(power_shortage_hours)
+- unit = hours
diff --git a/gqueries/output_elements/output_series/table_power_shortage/dashboard_power_shortage_peak.gql b/gqueries/output_elements/output_series/table_power_shortage/dashboard_power_shortage_peak.gql
new file mode 100644
index 0000000000..68c7d974ab
--- /dev/null
+++ b/gqueries/output_elements/output_series/table_power_shortage/dashboard_power_shortage_peak.gql
@@ -0,0 +1,2 @@
+- query = Q(power_shortage_peak)
+- unit = MW
diff --git a/gqueries/output_elements/output_series/table_power_shortage/dashboard_power_shortage_volume.gql b/gqueries/output_elements/output_series/table_power_shortage/dashboard_power_shortage_volume.gql
new file mode 100644
index 0000000000..4b2f64866e
--- /dev/null
+++ b/gqueries/output_elements/output_series/table_power_shortage/dashboard_power_shortage_volume.gql
@@ -0,0 +1,2 @@
+- query = Q(power_shortage_volume)
+- unit = PJ
diff --git a/gqueries/output_elements/output_series/table_power_shortage/dashboard_total_electricity_demand_peak.gql b/gqueries/output_elements/output_series/table_power_shortage/dashboard_total_electricity_demand_peak.gql
new file mode 100644
index 0000000000..0f82d134e2
--- /dev/null
+++ b/gqueries/output_elements/output_series/table_power_shortage/dashboard_total_electricity_demand_peak.gql
@@ -0,0 +1,2 @@
+- query = Q(total_electricity_demand_peak)
+- unit = MW
diff --git a/gqueries/output_elements/output_series/table_power_shortage/dashboard_total_electricity_demand_volume.gql b/gqueries/output_elements/output_series/table_power_shortage/dashboard_total_electricity_demand_volume.gql
new file mode 100644
index 0000000000..e5672385d9
--- /dev/null
+++ b/gqueries/output_elements/output_series/table_power_shortage/dashboard_total_electricity_demand_volume.gql
@@ -0,0 +1,2 @@
+- query = Q(total_electricity_demand_volume)
+- unit = PJ