diff --git a/sound_algo/data_only/matrix_presets/acid_journey.matrix b/sound_algo/data_only/matrix_presets/acid_journey.matrix
new file mode 100644
index 0000000..4131774
--- /dev/null
+++ b/sound_algo/data_only/matrix_presets/acid_journey.matrix
@@ -0,0 +1,18 @@
+[
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,0,0,0,0,6,6,6,6],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,0,0,0,0],
+ [0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0]
+]
diff --git a/sound_algo/data_only/matrix_presets/acid_storm.matrix b/sound_algo/data_only/matrix_presets/ambient_intro.matrix
similarity index 81%
rename from sound_algo/data_only/matrix_presets/acid_storm.matrix
rename to sound_algo/data_only/matrix_presets/ambient_intro.matrix
index 79fd8c8..7cbd381 100644
--- a/sound_algo/data_only/matrix_presets/acid_storm.matrix
+++ b/sound_algo/data_only/matrix_presets/ambient_intro.matrix
@@ -1,18 +1,18 @@
 [
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6]
+ [5,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,5,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,6,6,6,6,6,6,6]
 ]
diff --git a/sound_algo/data_only/matrix_presets/bass_science.matrix b/sound_algo/data_only/matrix_presets/bass_science.matrix
new file mode 100644
index 0000000..1ba7c29
--- /dev/null
+++ b/sound_algo/data_only/matrix_presets/bass_science.matrix
@@ -0,0 +1,18 @@
+[
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,6,6,6,6],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,6,6,6,6,0,0,0,0]
+]
diff --git a/sound_algo/data_only/matrix_presets/breakbeat.matrix b/sound_algo/data_only/matrix_presets/breakbeat.matrix
new file mode 100644
index 0000000..ef9450b
--- /dev/null
+++ b/sound_algo/data_only/matrix_presets/breakbeat.matrix
@@ -0,0 +1,18 @@
+[
+ [1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
+ [2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,2,2,2,2,2,2,2,6,0,0,0,0,6,6,6,6],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,6,6,6,0,0,0,0]
+]
diff --git a/sound_algo/data_only/matrix_presets/detroit.matrix b/sound_algo/data_only/matrix_presets/detroit_soul.matrix
similarity index 51%
rename from sound_algo/data_only/matrix_presets/detroit.matrix
rename to sound_algo/data_only/matrix_presets/detroit_soul.matrix
index 1702747..098d6cc 100644
--- a/sound_algo/data_only/matrix_presets/detroit.matrix
+++ b/sound_algo/data_only/matrix_presets/detroit_soul.matrix
@@ -1,18 +1,18 @@
 [
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,6,6,6,6],
  [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
 ]
diff --git a/sound_algo/data_only/matrix_presets/dub_chords.matrix b/sound_algo/data_only/matrix_presets/dub_chords.matrix
deleted file mode 100644
index f7f04f8..0000000
--- a/sound_algo/data_only/matrix_presets/dub_chords.matrix
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- [4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4],
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4],
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-]
diff --git a/sound_algo/data_only/matrix_presets/dub_space.matrix b/sound_algo/data_only/matrix_presets/dub_space.matrix
deleted file mode 100644
index c68afa0..0000000
--- a/sound_algo/data_only/matrix_presets/dub_space.matrix
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4],
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-]
diff --git a/sound_algo/data_only/matrix_presets/acid_line.matrix b/sound_algo/data_only/matrix_presets/dub_techno.matrix
similarity index 57%
rename from sound_algo/data_only/matrix_presets/acid_line.matrix
rename to sound_algo/data_only/matrix_presets/dub_techno.matrix
index ea03ab2..1398b3c 100644
--- a/sound_algo/data_only/matrix_presets/acid_line.matrix
+++ b/sound_algo/data_only/matrix_presets/dub_techno.matrix
@@ -1,18 +1,18 @@
 [
+ [4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0],
  [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0],
  [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,6,6,6,6,6,6,6,6]
 ]
diff --git a/sound_algo/data_only/matrix_presets/generate_presets.py b/sound_algo/data_only/matrix_presets/generate_presets.py
index 04de3cf..a99afeb 100644
--- a/sound_algo/data_only/matrix_presets/generate_presets.py
+++ b/sound_algo/data_only/matrix_presets/generate_presets.py
@@ -1,19 +1,22 @@
 #!/usr/bin/env python3
-"""Generate matrix preset .matrix files for the AV-Live matrix arranger.
+"""Generate creative matrix preset .matrix files for the AV-Live matrix arranger.
 
-Each preset is a 16-voice x 32-bar grid of colors 0-6, written as an SC-
-interpretable nested-array literal (read by ~matLoadFile in matrix.scd).
+Each preset is a 16-voice x 32-bar grid of colors 0-6, written as an
+SC-interpretable nested-array literal (read by ~matLoadFile in matrix.scd).
 
-These are NEW hand-authored arrangements *inspired by* the character of the 14
-data_only concert morceaux (the morceaux themselves use a different instrument
-set and have no bar structure, so they can't be transcribed -- see the matrix
-analysis). They are editable starting points: load one, tweak, save your own.
+These are hand-authored full-kit arrangements with a real 32-bar song shape:
+sections (intro / build / drop / break / final) that bring voices in and out,
+change density via the colour, and drop fills/accents. All 16 voices are used
+across the set; the percussive/textural voices (ride, rim, tom, reese, bells,
+sweep) are featured, not left empty.
 
 Voice row order MUST match ~matVoices in matrix.scd:
-  kick hats clap perc sub acid arp lead stab pad ride rim tom reese bells sweep
-Colors: 0 off | 1 base | 2 double-time(denser) | 3 oct+ | 4 half-time(sparse)
-        5 oct- | 6 accent. (3/5 are ~base until launchpad reads \\octave.)
-Run:  python3 generate_presets.py   (writes *.matrix next to this script)
+  0 kick  1 hats  2 clap  3 perc  4 sub   5 acid  6 arp   7 lead
+  8 stab  9 pad   10 ride 11 rim  12 tom  13 reese 14 bells 15 sweep
+Colours: 0 off | 1 base | 2 double-time (denser) | 3 oct+ | 4 half-time (sparse)
+         5 oct- | 6 accent.  (3/5 read ~base until launchpad reads \\octave;
+         used on melodic voices to mark octave intent.)
+Run:  python3 generate_presets.py
 """
 import os
 
@@ -24,105 +27,170 @@ BARS = 32
 HERE = os.path.dirname(os.path.abspath(__file__))
 
 
-def grid():
-    return [[0] * BARS for _ in range(len(VOICES))]
+def S(a, b, **voices):
+    """A section: bars a..b inclusive, each named voice set to its colour."""
+    return (a, b, voices)
 
 
-def put(g, voice, a, b, color):
-    """Fill voice rows bars a..b inclusive with color (clamped to grid)."""
-    for bar in range(max(0, a), min(BARS - 1, b) + 1):
-        g[VI[voice]][bar] = color
-
-
-def build(segments):
-    g = grid()
-    for (voice, a, b, color) in segments:
-        put(g, voice, a, b, color)
+def build(sections, fills=None):
+    g = [[0] * BARS for _ in range(len(VOICES))]
+    for (a, b, voices) in sections:
+        for name, color in voices.items():
+            for bar in range(max(0, a), min(BARS - 1, b) + 1):
+                g[VI[name]][bar] = color
+    for (name, bar, color) in (fills or []):
+        if 0 <= bar < BARS:
+            g[VI[name]][bar] = color
     return g
 
 
-# --- 14 arrangements (intro / build / main / breakdown / drop shape) ----------
-# Segment = (voice, startBar, endBar_inclusive, color)
+# Section windows used as a loose template (you can override per preset):
+#   A 0-7 intro | B 8-15 build | C 16-23 drop | D 24-27 break | E 28-31 final
 
-PRESETS = {
-    # 01 sparse hypnotic: half-time kick + sustained sub, minimal
-    "hypno_drift": [
-        ("kick", 0, 31, 4), ("sub", 0, 31, 1),
-        ("perc", 16, 31, 4), ("pad", 8, 31, 1),
-    ],
-    # 02 driving roll: quarter kick, 16th stab(perc), shaker hats
-    "hypno_roll": [
-        ("kick", 0, 31, 1), ("perc", 4, 31, 2), ("hats", 8, 31, 2),
-        ("sub", 8, 31, 1), ("stab", 16, 23, 1), ("perc", 24, 27, 4),
-    ],
-    # 03 acid line: kick + 16th acid + sub
-    "acid_line": [
-        ("kick", 0, 31, 1), ("sub", 0, 31, 1), ("acid", 4, 23, 2),
-        ("hats", 8, 31, 2), ("acid", 24, 27, 4), ("acid", 28, 31, 2),
-    ],
-    # 04 acid storm: denser acid, sweep accents on drops
-    "acid_storm": [
-        ("kick", 0, 31, 1), ("sub", 0, 31, 1), ("acid", 0, 31, 2),
-        ("hats", 8, 31, 2), ("clap", 16, 31, 1),
-        ("sweep", 15, 15, 6), ("sweep", 31, 31, 6), ("acid", 24, 27, 4),
-    ],
-    # 05 hard pump: kick + perc 8th + sub rumble
-    "hard_pump": [
-        ("kick", 0, 31, 1), ("sub", 0, 31, 2), ("perc", 4, 31, 2),
-        ("hats", 12, 31, 2), ("clap", 16, 31, 1), ("perc", 24, 27, 4),
-    ],
-    # 06 hard rave: break kick, stab hoover, sweep crash
-    "hard_rave": [
-        ("kick", 0, 31, 1), ("clap", 4, 31, 1), ("stab", 8, 23, 1),
-        ("hats", 8, 31, 2), ("sweep", 15, 15, 6), ("sweep", 23, 23, 6),
-        ("stab", 28, 31, 6),
-    ],
-    # 07 dub chords: very sparse, half kick + sub + pad chord stabs
-    "dub_chords": [
-        ("kick", 0, 31, 4), ("sub", 0, 31, 1), ("pad", 0, 31, 1),
-        ("stab", 8, 31, 4), ("perc", 16, 31, 4),
-    ],
-    # 08 dub space: outro -- sub + occasional perc clicks
-    "dub_space": [
-        ("sub", 0, 31, 1), ("perc", 0, 31, 4), ("pad", 8, 31, 1),
-        ("kick", 16, 31, 4),
-    ],
-    # 09 trance pluck: kick + sub + arp 16ths + lead
-    "trance_pluck": [
-        ("kick", 0, 31, 1), ("sub", 0, 31, 1), ("arp", 4, 31, 2),
-        ("hats", 8, 31, 2), ("lead", 16, 23, 1), ("arp", 24, 27, 4),
-        ("lead", 28, 31, 1),
-    ],
-    # 10 industrial: kick + half stab + perc + sub rumble
-    "industrial": [
-        ("kick", 0, 31, 1), ("sub", 0, 31, 2), ("stab", 4, 31, 4),
-        ("perc", 8, 31, 2), ("hats", 12, 31, 2), ("clap", 16, 31, 1),
-    ],
-    # 11 detroit: kick + hats + sustained pad + stab
-    "detroit": [
-        ("kick", 0, 31, 1), ("pad", 0, 31, 1), ("hats", 4, 31, 2),
-        ("sub", 8, 31, 1), ("stab", 16, 23, 1), ("stab", 28, 31, 1),
-        ("hats", 24, 27, 4),
-    ],
-    # 12 trance: rich -- kick hats sub lead pad
-    "trance": [
-        ("kick", 0, 31, 1), ("pad", 0, 31, 1), ("sub", 4, 31, 1),
-        ("hats", 8, 31, 2), ("lead", 16, 23, 2), ("arp", 16, 31, 2),
-        ("lead", 24, 27, 4), ("lead", 28, 31, 2), ("clap", 16, 31, 1),
-    ],
-    # 13 psytrance: kick + rolling sub + acid + sweep zaps
-    "psytrance": [
-        ("kick", 0, 31, 1), ("sub", 0, 31, 2), ("acid", 4, 31, 2),
-        ("hats", 8, 31, 2), ("sweep", 15, 15, 6), ("sweep", 31, 31, 6),
-        ("acid", 24, 27, 4),
-    ],
-    # 14 punkcore: kick + clap snare + hats + stab chord + lead
-    "punkcore": [
-        ("kick", 0, 31, 1), ("clap", 0, 31, 1), ("hats", 4, 31, 2),
-        ("stab", 8, 31, 2), ("lead", 16, 23, 2), ("sub", 8, 31, 1),
-        ("lead", 28, 31, 6),
-    ],
-}
+PRESETS = {}
+
+# 1. Four-on-floor techno, ride-driven, acid stabs on the drop
+PRESETS["techno_drive"] = build([
+    S(0, 7,   kick=1, sub=1, hats=4),
+    S(8, 15,  kick=1, sub=1, hats=2, ride=1, perc=2),
+    S(16, 23, kick=1, sub=1, hats=2, ride=1, perc=2, clap=1, stab=1, acid=2),
+    S(24, 27, hats=4, pad=1, ride=1),
+    S(28, 31, kick=1, sub=1, hats=2, clap=1, acid=2, stab=6, ride=1),
+], [("sweep", 7, 6), ("sweep", 15, 6), ("sweep", 27, 6), ("tom", 23, 6)])
+
+# 2. Acid journey on a reese bass, lead octave leaps
+PRESETS["acid_journey"] = build([
+    S(0, 7,   kick=1, sub=1, acid=1),
+    S(8, 15,  kick=1, reese=2, acid=2, hats=2, rim=2),
+    S(16, 23, kick=1, reese=2, acid=2, hats=2, ride=1, clap=1, lead=3),
+    S(24, 27, acid=4, pad=1, bells=3),
+    S(28, 31, kick=1, reese=2, acid=2, hats=2, clap=1, lead=6),
+], [("sweep", 7, 6), ("sweep", 15, 6), ("sweep", 23, 6), ("tom", 31, 6)])
+
+# 3. Euphoric trance: supersaw pad + arp + bell motif, big lead on final
+PRESETS["trance_euphoria"] = build([
+    S(0, 7,   sub=1, pad=1, arp=1, bells=5),
+    S(8, 15,  kick=1, sub=1, pad=1, arp=2, hats=2, bells=3),
+    S(16, 23, kick=1, sub=1, pad=1, arp=2, hats=2, ride=1, clap=1, lead=2),
+    S(24, 27, pad=1, bells=3, arp=1),
+    S(28, 31, kick=1, sub=1, pad=1, arp=2, hats=2, lead=6, clap=1),
+], [("sweep", 7, 6), ("sweep", 15, 6), ("sweep", 27, 6)])
+
+# 4. Rolling psytrance: triplet-feel sub, 16th acid, tom rolls
+PRESETS["psytrance_roll"] = build([
+    S(0, 7,   kick=1, sub=2),
+    S(8, 15,  kick=1, sub=2, acid=2, hats=2),
+    S(16, 23, kick=1, sub=2, acid=2, hats=2, ride=2, perc=2, reese=2),
+    S(24, 27, sub=2, acid=4, bells=3),
+    S(28, 31, kick=1, sub=2, acid=2, hats=2, perc=2, lead=6),
+], [("sweep", 15, 6), ("sweep", 31, 6), ("tom", 22, 6), ("tom", 23, 6)])
+
+# 5. Detroit soul: warm pad, stabs, bell counter-melody, rim shuffle
+PRESETS["detroit_soul"] = build([
+    S(0, 7,   kick=1, pad=1, sub=1),
+    S(8, 15,  kick=1, pad=1, sub=1, hats=2, rim=2),
+    S(16, 23, kick=1, pad=1, sub=1, hats=2, ride=1, clap=1, stab=1, bells=3),
+    S(24, 27, pad=1, bells=3, hats=4),
+    S(28, 31, kick=1, pad=1, sub=1, hats=2, clap=1, stab=6, rim=2),
+], [("sweep", 15, 6), ("tom", 31, 6)])
+
+# 6. Industrial grind: reese rumble, metallic stabs, tom-heavy fills
+PRESETS["industrial_grind"] = build([
+    S(0, 7,   kick=1, reese=1, stab=4),
+    S(8, 15,  kick=1, reese=2, stab=4, perc=2, hats=2, rim=2),
+    S(16, 23, kick=1, reese=2, stab=2, perc=2, hats=2, tom=2, clap=1, ride=1),
+    S(24, 27, reese=1, tom=4, sweep=6),
+    S(28, 31, kick=1, reese=2, stab=2, perc=2, clap=1, tom=6),
+], [("tom", 14, 6), ("tom", 15, 6), ("sweep", 23, 6)])
+
+# 7. Hardcore punk: driving, snare(clap+rim) backbeat, power-chord stab, lead
+PRESETS["hardcore_punk"] = build([
+    S(0, 7,   kick=2, sub=1),
+    S(8, 15,  kick=2, sub=1, hats=2, clap=1, rim=1),
+    S(16, 23, kick=2, sub=1, hats=2, clap=1, rim=1, stab=2, lead=2, ride=2),
+    S(24, 27, kick=4, stab=4, sweep=6),
+    S(28, 31, kick=2, sub=1, hats=2, clap=1, stab=2, lead=6, tom=6),
+], [("tom", 30, 6), ("tom", 31, 6)])
+
+# 8. Dub techno: very sparse, deep sub, spacey stabs/bells, brushed perc
+PRESETS["dub_techno"] = build([
+    S(0, 7,   kick=4, sub=1, pad=1),
+    S(8, 15,  kick=4, sub=1, pad=1, perc=4, rim=4),
+    S(16, 23, kick=1, sub=1, pad=1, perc=4, hats=4, stab=4, bells=3),
+    S(24, 31, sub=1, pad=1, bells=3, sweep=6),
+], [("sweep", 23, 6), ("rim", 31, 6)])
+
+# 9. Breakbeat: syncopated kick variations, ride/perc/tom groove
+PRESETS["breakbeat"] = build([
+    S(0, 7,   kick=1, sub=1, hats=2),
+    S(8, 15,  kick=2, sub=1, hats=2, ride=2, perc=2, clap=1),
+    S(16, 23, kick=2, sub=1, hats=2, ride=2, perc=2, clap=1, rim=2, acid=2, tom=2),
+    S(24, 27, kick=4, perc=4, sweep=6),
+    S(28, 31, kick=2, sub=1, hats=2, perc=2, clap=1, tom=6),
+], [("tom", 15, 6), ("tom", 23, 6)])
+
+# 10. Minimal hypno: hypnotic, very few elements, slow evolution
+PRESETS["minimal_hypno"] = build([
+    S(0, 15,  kick=1, sub=1, rim=2),
+    S(8, 23,  perc=2),
+    S(16, 31, kick=1, sub=1, rim=2, hats=4, pad=1),
+    S(24, 27, kick=4),
+], [("bells", 16, 3), ("bells", 24, 3), ("sweep", 23, 6)])
+
+# 11. Ambient intro: no drums, pads/bells/arp/sub wash + riser (opener)
+PRESETS["ambient_intro"] = build([
+    S(0, 31,  pad=1, sub=1),
+    S(8, 23,  bells=3, arp=1),
+    S(16, 31, reese=1),
+    S(24, 31, sweep=6),
+], [("bells", 0, 5), ("bells", 8, 3), ("bells", 16, 5), ("sweep", 31, 6)])
+
+# 12. Peak drop: full kit, everything at the drop -- max energy reference
+PRESETS["peak_drop"] = build([
+    S(0, 7,   kick=1, sub=1, hats=2, sweep=6),
+    S(8, 15,  kick=1, sub=1, hats=2, ride=1, perc=2, clap=1, stab=1),
+    S(16, 23, kick=1, sub=1, hats=2, ride=2, perc=2, clap=1, stab=2,
+              acid=2, lead=2, arp=2, pad=1, rim=2, tom=2, bells=3, reese=2),
+    S(24, 27, pad=1, bells=3, sweep=6, hats=4),
+    S(28, 31, kick=1, sub=1, hats=2, ride=2, clap=1, stab=2, acid=2,
+              lead=6, tom=6, reese=2),
+], [("sweep", 15, 6), ("tom", 23, 6)])
+
+# 13. Rave stab: classic hoover stabs, bells, big claps
+PRESETS["rave_stab"] = build([
+    S(0, 7,   kick=1, sub=1, stab=4),
+    S(8, 15,  kick=1, sub=1, stab=2, hats=2, clap=1),
+    S(16, 23, kick=1, sub=1, stab=2, hats=2, clap=1, ride=1, bells=3, sweep=6),
+    S(24, 27, stab=4, bells=3),
+    S(28, 31, kick=1, sub=1, stab=6, hats=2, clap=1, bells=5),
+], [("sweep", 7, 6), ("sweep", 23, 6)])
+
+# 14. Tribal perc: percussion workout -- perc/tom/rim/ride lead, sparse kick
+PRESETS["tribal_perc"] = build([
+    S(0, 7,   kick=1, perc=2, rim=2),
+    S(8, 15,  kick=1, perc=2, rim=2, tom=2, ride=2),
+    S(16, 23, kick=1, perc=2, rim=2, tom=2, ride=2, hats=2, sub=1, clap=1),
+    S(24, 27, perc=4, tom=4, sweep=6),
+    S(28, 31, kick=1, perc=2, rim=2, tom=6, ride=2, clap=1),
+], [("tom", 14, 6), ("tom", 15, 6), ("tom", 22, 6), ("tom", 23, 6)])
+
+# 15. Bass science: sub + reese interplay, neuro-ish, sparse top
+PRESETS["bass_science"] = build([
+    S(0, 7,   kick=1, sub=1),
+    S(8, 15,  kick=1, sub=2, reese=2, hats=4),
+    S(16, 23, kick=1, sub=2, reese=2, hats=2, perc=2, acid=2, rim=2),
+    S(24, 27, reese=4, sub=1, sweep=6),
+    S(28, 31, kick=1, sub=2, reese=2, hats=2, perc=2, tom=6),
+], [("sweep", 15, 6), ("tom", 23, 6)])
+
+# 16. Melodic builder: arp + lead + bells over pad, long build to a lead peak
+PRESETS["melodic_builder"] = build([
+    S(0, 7,   pad=1, sub=1, arp=1),
+    S(8, 15,  kick=1, pad=1, sub=1, arp=2, hats=2, bells=3),
+    S(16, 23, kick=1, pad=1, sub=1, arp=2, hats=2, ride=1, lead=2, stab=1),
+    S(24, 27, pad=1, bells=5, arp=1),
+    S(28, 31, kick=1, pad=1, sub=1, arp=2, hats=2, lead=6, clap=1, bells=3),
+], [("sweep", 7, 6), ("sweep", 15, 6), ("sweep", 27, 6)])
 
 
 def to_sc_literal(g):
@@ -131,13 +199,18 @@ def to_sc_literal(g):
 
 
 def main():
-    for name, segs in PRESETS.items():
-        g = build(segs)
-        path = os.path.join(HERE, name + ".matrix")
-        with open(path, "w") as f:
+    used = set()
+    for name, g in PRESETS.items():
+        for vi, row in enumerate(g):
+            if any(row):
+                used.add(VOICES[vi])
+        with open(os.path.join(HERE, name + ".matrix"), "w") as f:
             f.write(to_sc_literal(g))
-        print("wrote", path)
-    print(len(PRESETS), "presets generated")
+        print("wrote", name + ".matrix")
+    print(len(PRESETS), "presets;", len(used), "/ 16 voices used:", sorted(used))
+    missing = [v for v in VOICES if v not in used]
+    if missing:
+        print("WARNING unused voices:", missing)
 
 
 if __name__ == "__main__":
diff --git a/sound_algo/data_only/matrix_presets/hard_pump.matrix b/sound_algo/data_only/matrix_presets/hard_pump.matrix
deleted file mode 100644
index 2a40674..0000000
--- a/sound_algo/data_only/matrix_presets/hard_pump.matrix
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
- [2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-]
diff --git a/sound_algo/data_only/matrix_presets/hard_rave.matrix b/sound_algo/data_only/matrix_presets/hard_rave.matrix
deleted file mode 100644
index 0399d79..0000000
--- a/sound_algo/data_only/matrix_presets/hard_rave.matrix
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
- [0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,6,6,6,6],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0]
-]
diff --git a/sound_algo/data_only/matrix_presets/hardcore_punk.matrix b/sound_algo/data_only/matrix_presets/hardcore_punk.matrix
new file mode 100644
index 0000000..84d6ea3
--- /dev/null
+++ b/sound_algo/data_only/matrix_presets/hardcore_punk.matrix
@@ -0,0 +1,18 @@
+[
+ [2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,6,6,6,6],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,6,6,6],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,6,6,6,0,0,0,0]
+]
diff --git a/sound_algo/data_only/matrix_presets/hypno_drift.matrix b/sound_algo/data_only/matrix_presets/hypno_drift.matrix
deleted file mode 100644
index 6dad909..0000000
--- a/sound_algo/data_only/matrix_presets/hypno_drift.matrix
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- [4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4],
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-]
diff --git a/sound_algo/data_only/matrix_presets/industrial_grind.matrix b/sound_algo/data_only/matrix_presets/industrial_grind.matrix
new file mode 100644
index 0000000..8418e9b
--- /dev/null
+++ b/sound_algo/data_only/matrix_presets/industrial_grind.matrix
@@ -0,0 +1,18 @@
+[
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,6,2,2,2,2,2,2,2,2,4,4,4,4,6,6,6,6],
+ [1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,6,6,6,6,0,0,0,0]
+]
diff --git a/sound_algo/data_only/matrix_presets/melodic_builder.matrix b/sound_algo/data_only/matrix_presets/melodic_builder.matrix
new file mode 100644
index 0000000..5841c62
--- /dev/null
+++ b/sound_algo/data_only/matrix_presets/melodic_builder.matrix
@@ -0,0 +1,18 @@
+[
+ [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,6,6,6,6],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,5,5,5,5,3,3,3,3],
+ [0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0]
+]
diff --git a/sound_algo/data_only/matrix_presets/industrial.matrix b/sound_algo/data_only/matrix_presets/minimal_hypno.matrix
similarity index 69%
rename from sound_algo/data_only/matrix_presets/industrial.matrix
rename to sound_algo/data_only/matrix_presets/minimal_hypno.matrix
index 5598838..eca638f 100644
--- a/sound_algo/data_only/matrix_presets/industrial.matrix
+++ b/sound_algo/data_only/matrix_presets/minimal_hypno.matrix
@@ -1,18 +1,18 @@
 [
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4,4,4,4,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
  [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0]
 ]
diff --git a/sound_algo/data_only/matrix_presets/peak_drop.matrix b/sound_algo/data_only/matrix_presets/peak_drop.matrix
new file mode 100644
index 0000000..adcd440
--- /dev/null
+++ b/sound_algo/data_only/matrix_presets/peak_drop.matrix
@@ -0,0 +1,18 @@
+[
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
+ [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,6,6,6,6],
+ [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0],
+ [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,6,0,0,0,0,6,6,6,6],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0],
+ [6,6,6,6,6,6,6,6,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,6,6,6,6,0,0,0,0]
+]
diff --git a/sound_algo/data_only/matrix_presets/psytrance.matrix b/sound_algo/data_only/matrix_presets/psytrance.matrix
deleted file mode 100644
index 56b914c..0000000
--- a/sound_algo/data_only/matrix_presets/psytrance.matrix
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
- [0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6]
-]
diff --git a/sound_algo/data_only/matrix_presets/psytrance_roll.matrix b/sound_algo/data_only/matrix_presets/psytrance_roll.matrix
new file mode 100644
index 0000000..996905a
--- /dev/null
+++ b/sound_algo/data_only/matrix_presets/psytrance_roll.matrix
@@ -0,0 +1,18 @@
+[
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,6,6,6],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,6,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6]
+]
diff --git a/sound_algo/data_only/matrix_presets/hypno_roll.matrix b/sound_algo/data_only/matrix_presets/rave_stab.matrix
similarity index 57%
rename from sound_algo/data_only/matrix_presets/hypno_roll.matrix
rename to sound_algo/data_only/matrix_presets/rave_stab.matrix
index fa1ebb9..40e08eb 100644
--- a/sound_algo/data_only/matrix_presets/hypno_roll.matrix
+++ b/sound_algo/data_only/matrix_presets/rave_stab.matrix
@@ -1,18 +1,18 @@
 [
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
- [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [4,4,4,4,4,4,4,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,6,6,6,6],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,5,5,5,5],
+ [0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,6,6,6,6,6,6,6,6,0,0,0,0,0,0,0,0]
 ]
diff --git a/sound_algo/data_only/matrix_presets/techno_drive.matrix b/sound_algo/data_only/matrix_presets/techno_drive.matrix
new file mode 100644
index 0000000..8cc8a5f
--- /dev/null
+++ b/sound_algo/data_only/matrix_presets/techno_drive.matrix
@@ -0,0 +1,18 @@
+[
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [4,4,4,4,4,4,4,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,6,6,6,6],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0],
+ [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0]
+]
diff --git a/sound_algo/data_only/matrix_presets/trance.matrix b/sound_algo/data_only/matrix_presets/trance.matrix
deleted file mode 100644
index b7ea93f..0000000
--- a/sound_algo/data_only/matrix_presets/trance.matrix
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-]
diff --git a/sound_algo/data_only/matrix_presets/punkcore.matrix b/sound_algo/data_only/matrix_presets/trance_euphoria.matrix
similarity index 52%
rename from sound_algo/data_only/matrix_presets/punkcore.matrix
rename to sound_algo/data_only/matrix_presets/trance_euphoria.matrix
index bc82e32..0da6412 100644
--- a/sound_algo/data_only/matrix_presets/punkcore.matrix
+++ b/sound_algo/data_only/matrix_presets/trance_euphoria.matrix
@@ -1,18 +1,18 @@
 [
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
+ [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,2,2,2,2],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,6,6,6,6],
- [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+ [5,5,5,5,5,5,5,5,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,3,3,3,3,0,0,0,0],
+ [0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0]
 ]
diff --git a/sound_algo/data_only/matrix_presets/trance_pluck.matrix b/sound_algo/data_only/matrix_presets/tribal_perc.matrix
similarity index 52%
rename from sound_algo/data_only/matrix_presets/trance_pluck.matrix
rename to sound_algo/data_only/matrix_presets/tribal_perc.matrix
index c3f83d1..f0e4356 100644
--- a/sound_algo/data_only/matrix_presets/trance_pluck.matrix
+++ b/sound_algo/data_only/matrix_presets/tribal_perc.matrix
@@ -1,18 +1,18 @@
 [
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
+ [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1],
+ [2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2],
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2],
+ [0,0,0,0,0,0,0,0,2,2,2,2,2,2,6,6,2,2,2,2,2,2,6,6,4,4,4,4,6,6,6,6],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+ [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,6,6,6,0,0,0,0]
 ]