diff --git a/INTERNAL_PARAM_DEF/jade_e180_energy.xml b/INTERNAL_PARAM_DEF/jade_e180_energy.xml
new file mode 100644
index 0000000..8378a16
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jade_e180_energy.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/INTERNAL_PARAM_DEF/jade_e180_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_e180_lower_energy.xml
deleted file mode 100644
index f67a9b7..0000000
--- a/INTERNAL_PARAM_DEF/jade_e180_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_e180_LOWER_ENERGY_E180[##lookdir##]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_e180_sum_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_e180_sum_lower_energy.xml
deleted file mode 100644
index 3a7bde3..0000000
--- a/INTERNAL_PARAM_DEF/jade_e180_sum_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_e180_LOWER_ENERGY_E180[0]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_e180_sum_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_e180_sum_upper_energy.xml
deleted file mode 100644
index babcd0c..0000000
--- a/INTERNAL_PARAM_DEF/jade_e180_sum_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_e180_UPPER_ENERGY_E180[0]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_e180_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_e180_upper_energy.xml
deleted file mode 100644
index 89c6aaf..0000000
--- a/INTERNAL_PARAM_DEF/jade_e180_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_e180_UPPER_ENERGY_E180[##lookdir##]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_e300_energy.xml b/INTERNAL_PARAM_DEF/jade_e300_energy.xml
new file mode 100644
index 0000000..a95cc46
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jade_e300_energy.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/INTERNAL_PARAM_DEF/jade_e300_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_e300_lower_energy.xml
deleted file mode 100644
index 3ca2172..0000000
--- a/INTERNAL_PARAM_DEF/jade_e300_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_e300_LOWER_ENERGY_E300[##lookdir##]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_e300_sum_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_e300_sum_lower_energy.xml
deleted file mode 100644
index 6c51f14..0000000
--- a/INTERNAL_PARAM_DEF/jade_e300_sum_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_e300_LOWER_ENERGY_E300[0]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_e300_sum_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_e300_sum_upper_energy.xml
deleted file mode 100644
index 0dfb726..0000000
--- a/INTERNAL_PARAM_DEF/jade_e300_sum_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_e300_UPPER_ENERGY_E300[0]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_e300_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_e300_upper_energy.xml
deleted file mode 100644
index 128b0b1..0000000
--- a/INTERNAL_PARAM_DEF/jade_e300_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_e300_UPPER_ENERGY_E300[##lookdir##]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_e60_energy.xml b/INTERNAL_PARAM_DEF/jade_e60_energy.xml
new file mode 100644
index 0000000..cef52f5
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jade_e60_energy.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/INTERNAL_PARAM_DEF/jade_e60_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_e60_lower_energy.xml
deleted file mode 100644
index 0d57049..0000000
--- a/INTERNAL_PARAM_DEF/jade_e60_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_e060_LOWER_ENERGY_E060[##lookdir##]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_e60_sum_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_e60_sum_lower_energy.xml
deleted file mode 100644
index f8aa5c2..0000000
--- a/INTERNAL_PARAM_DEF/jade_e60_sum_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_e060_LOWER_ENERGY_E060[0]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_e60_sum_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_e60_sum_upper_energy.xml
deleted file mode 100644
index b51efad..0000000
--- a/INTERNAL_PARAM_DEF/jade_e60_sum_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_e060_UPPER_ENERGY_E060[0]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_e60_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_e60_upper_energy.xml
deleted file mode 100644
index 0b6b5ab..0000000
--- a/INTERNAL_PARAM_DEF/jade_e60_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_e060_UPPER_ENERGY_E060[##lookdir##]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_ispec_energy.xml b/INTERNAL_PARAM_DEF/jade_ispec_energy.xml
new file mode 100644
index 0000000..6c0776f
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jade_ispec_energy.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/INTERNAL_PARAM_DEF/jade_ispec_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_ispec_lower_energy.xml
deleted file mode 100644
index 6e1696d..0000000
--- a/INTERNAL_PARAM_DEF/jade_ispec_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_ions_LOWER_ENERGY_##species##[##lookdir##]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_ispec_sum_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_ispec_sum_lower_energy.xml
deleted file mode 100644
index 319c96a..0000000
--- a/INTERNAL_PARAM_DEF/jade_ispec_sum_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_ions_LOWER_ENERGY_##species##[0]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_ispec_sum_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_ispec_sum_upper_energy.xml
deleted file mode 100644
index be8f3dc..0000000
--- a/INTERNAL_PARAM_DEF/jade_ispec_sum_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_ions_UPPER_ENERGY_##species##[0]
-
-
diff --git a/INTERNAL_PARAM_DEF/jade_ispec_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_ispec_upper_energy.xml
deleted file mode 100644
index 7b3ef60..0000000
--- a/INTERNAL_PARAM_DEF/jade_ispec_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
- $juno_jade_ions_UPPER_ENERGY_##species##[##lookdir##]
-
-
diff --git a/PARAM_DEF/jade_e180_cps.xml b/PARAM_DEF/jade_e180_cps.xml
index b903668..e9d2a7a 100644
--- a/PARAM_DEF/jade_e180_cps.xml
+++ b/PARAM_DEF/jade_e180_cps.xml
@@ -2,15 +2,15 @@
+ 100
-
-
+
$juno_jade_e180_DATA_E180[##lookdir##]