diff --git a/dataset/eval/enst/drummer_2_115_minus-one_salsa_sticks.csv b/dataset/eval/enst/drummer_2_115_minus-one_salsa_sticks.csv
index 6044b860057b79a0e603038024e6e8b2e92f05ac..8a4b3ae00506f035ef3889ed03b9f8fe66f67c78 100644
--- a/dataset/eval/enst/drummer_2_115_minus-one_salsa_sticks.csv
+++ b/dataset/eval/enst/drummer_2_115_minus-one_salsa_sticks.csv
@@ -2,55 +2,74 @@ onset_time_s,class_5
 1.844000,1
 2.163000,1
 2.296000,1
+2.436000,2
 2.446000,0
 2.601000,1
+2.747000,2
 2.880000,1
 2.892000,0
 3.208000,1
+3.212000,2
 3.354000,0
 3.497000,1
 3.559000,1
 3.614000,1
 3.649000,1
+3.651000,2
 3.653000,0
 3.689000,1
 3.727000,1
 3.774000,1
 3.820000,1
 3.843000,1
+3.950000,2
 4.117000,0
+4.546000,2
 4.547000,0
 4.853000,1
 4.868000,0
 4.920000,1
 4.994000,1
 5.083000,1
+5.091000,2
 5.184000,1
 5.274000,1
 5.301000,0
+5.727000,2
 5.731000,0
 5.852000,1
 5.926000,1
+6.011000,2
 6.041000,0
 6.190000,1
 6.438000,1
 6.623000,1
 6.846000,1
 7.077000,1
+7.230000,2
 7.249000,0
 7.426000,1
+7.547000,2
 7.696000,0
 7.698000,1
 8.007000,1
+8.136000,2
 8.148000,0
 8.260000,1
 8.454000,0
 8.581000,1
+8.740000,2
 8.899000,1
 8.901000,0
+9.343000,2
 9.354000,0
+9.506000,2
+9.581000,2
 9.670000,0
+9.672000,2
+9.947000,2
 10.103000,0
+10.246000,2
 10.259000,1
 10.393000,1
 10.461000,1
@@ -64,178 +83,236 @@ onset_time_s,class_5
 12.052000,1
 12.058000,0
 12.257000,1
+12.321000,2
 12.496000,1
 12.500000,0
 12.812000,1
 12.950000,0
+12.951000,2
 13.102000,1
 13.150000,1
 13.208000,1
 13.249000,0
 13.252000,1
+13.549000,2
 13.685000,0
 13.851000,1
 13.974000,1
+14.127000,2
 14.133000,0
 14.278000,1
 14.591000,1
+14.730000,2
 14.896000,0
 15.188000,1
+15.331000,2
 15.337000,0
 15.497000,1
 15.645000,0
+15.941000,2
 16.110000,0
 16.434000,1
 16.551000,0
+16.553000,2
 16.879000,0
 16.879000,1
 16.932000,1
 16.987000,1
 17.051000,1
 17.121000,1
+17.163000,2
 17.193000,1
 17.250000,1
 17.328000,0
+17.764000,2
 17.767000,0
 17.923000,1
 18.074000,0
 18.206000,1
+18.370000,2
 18.519000,0
 18.814000,1
 18.948000,0
 19.116000,1
 19.249000,0
 19.411000,1
+19.555000,2
 19.695000,0
 20.124000,0
+20.141000,2
 20.299000,1
+20.450000,3
 20.460000,0
 20.585000,1
+20.701000,2
 20.745000,1
 20.887000,1
 21.039000,1
 21.045000,0
+21.181000,3
+21.333000,3
 21.347000,0
 21.644000,1
 21.657000,0
+21.929000,2
 22.099000,0
 22.393000,1
+22.515000,2
 22.518000,0
 22.675000,1
+23.099000,2
 23.252000,0
 23.561000,1
+23.699000,2
 23.705000,0
 23.886000,1
 24.026000,0
 24.195000,1
+24.329000,2
 24.494000,0
 24.631000,1
 24.695000,1
 24.763000,1
 24.831000,1
 24.917000,1
+24.927000,2
 24.932000,0
 25.243000,1
 25.250000,0
 25.413000,1
+25.545000,2
 25.673000,1
 25.711000,0
 25.835000,1
 26.008000,1
 26.151000,0
+26.153000,2
 26.250000,1
 26.434000,1
 26.461000,0
+26.741000,2
 26.876000,1
 26.917000,0
 27.156000,1
+27.321000,2
 27.326000,0
 27.488000,1
 27.635000,0
 27.774000,1
+27.935000,2
 28.092000,1
 28.094000,0
 28.408000,1
+28.529000,2
 28.538000,0
 28.691000,1
 28.846000,0
 29.215000,1
 29.305000,0
 29.581000,1
+29.736000,2
 29.739000,0
 29.900000,1
 30.048000,0
 30.192000,1
+30.346000,2
 30.501000,1
+30.616000,2
 30.635000,1
 30.809000,1
+30.934000,3
 30.935000,0
 31.095000,1
+31.223000,2
 31.247000,0
 31.395000,1
 31.717000,0
 32.006000,1
+32.137000,2
 32.145000,0
 32.302000,1
 32.451000,0
 32.587000,1
+32.743000,2
 32.914000,0
 33.198000,1
+33.341000,2
 33.347000,0
 33.483000,1
 33.644000,0
 33.791000,1
+33.936000,2
 34.096000,0
 34.239000,1
+34.240000,2
+34.508000,2
 34.517000,0
 34.660000,1
 34.822000,0
+34.824000,2
 34.962000,1
+35.100000,2
 35.265000,0
+35.408000,2
 35.711000,0
 35.714000,1
 35.763000,1
 35.839000,1
 35.910000,1
+35.998000,2
 36.012000,1
 36.014000,0
 36.171000,1
 36.468000,1
 36.469000,0
+36.602000,2
 36.763000,1
+36.908000,2
 36.912000,0
 37.068000,1
+37.230000,2
 37.234000,0
 37.367000,1
+37.530000,2
 37.686000,1
 37.694000,0
 37.977000,1
+38.110000,2
 38.264000,1
 38.423000,0
+38.725000,2
 38.917000,0
 39.197000,1
+39.354000,2
 39.355000,0
 39.491000,1
 39.792000,1
+39.918000,2
 40.068000,1
 40.073000,0
 40.149000,0
 40.149000,1
 40.224000,1
+40.508000,2
 40.690000,1
+40.818000,2
 40.835000,0
 40.973000,1
+41.105000,2
 41.305000,0
 41.306000,1
 41.594000,1
 41.746000,0
 41.912000,1
+42.336000,2
 42.506000,0
 42.796000,1
 42.925000,0
+42.925000,2
 43.073000,1
 43.224000,0
 43.388000,1
+43.532000,2
 43.684000,0
 43.824000,1
 43.858000,1
@@ -243,30 +320,44 @@ onset_time_s,class_5
 43.912000,1
 43.940000,1
 43.970000,1
+44.121000,2
 44.125000,0
 44.430000,0
+44.432000,2
 44.551000,1
+44.725000,2
 44.890000,0
 45.046000,1
+45.047000,2
 45.344000,0
 45.345000,1
+45.346000,2
 45.503000,1
 45.647000,0
 45.648000,1
+45.651000,2
+45.926000,2
 46.094000,0
 46.379000,1
 46.530000,0
+46.532000,2
 46.690000,1
 46.835000,0
 46.974000,1
+47.114000,2
 47.289000,0
 47.572000,1
+47.720000,2
 47.726000,0
 47.877000,1
 48.031000,0
+48.033000,2
 48.186000,1
+48.330000,2
 48.491000,0
 48.639000,1
+48.640000,2
+48.943000,2
 48.944000,1
 48.945000,0
 49.257000,0
@@ -282,74 +373,98 @@ onset_time_s,class_5
 50.054000,1
 50.129000,1
 50.142000,0
+50.436000,2
 50.438000,1
 50.444000,0
+50.727000,2
 50.896000,0
 51.044000,1
 51.196000,1
 51.323000,0
 51.502000,1
 51.768000,1
+51.921000,2
 52.081000,0
 52.399000,1
 52.514000,0
 52.819000,1
 52.824000,0
+53.107000,2
 53.288000,0
+53.438000,2
 53.580000,1
+53.711000,2
 53.716000,0
 53.868000,1
 54.162000,1
+54.306000,2
 54.438000,0
 54.486000,1
+54.570000,2
 54.889000,0
 55.039000,1
+55.169000,2
 55.191000,0
 55.344000,1
+55.496000,2
 55.682000,1
 55.689000,0
 55.998000,1
 56.145000,0
 56.297000,1
 56.603000,1
+56.753000,2
 56.902000,1
 56.903000,0
 57.213000,1
 57.337000,0
+57.339000,2
 57.500000,1
 57.640000,0
 57.785000,1
+57.931000,2
 58.080000,0
 58.113000,1
 58.387000,1
 58.536000,0
+58.538000,2
 58.713000,1
+58.799000,2
 58.852000,0
 58.988000,1
+59.137000,2
 59.279000,0
 59.609000,1
 59.766000,0
 59.768000,1
 59.902000,1
+60.035000,2
 60.060000,0
 60.204000,1
+60.337000,2
 60.510000,1
 60.516000,0
 60.806000,1
 60.941000,0
+60.943000,2
 61.109000,1
 61.391000,1
+61.531000,2
 61.707000,0
 61.982000,1
 62.127000,0
+62.129000,2
 62.288000,1
 62.425000,0
 62.585000,1
+62.729000,2
 62.866000,0
 63.180000,1
 63.329000,0
+63.331000,2
 63.480000,1
 63.774000,1
+63.919000,2
 64.089000,1
 64.091000,0
 64.388000,1
@@ -358,32 +473,41 @@ onset_time_s,class_5
 64.685000,1
 64.842000,0
 64.994000,1
+65.126000,2
 65.297000,0
 65.591000,1
 65.728000,0
+65.730000,2
 65.894000,1
 66.193000,1
+66.328000,2
 66.523000,0
 66.778000,1
+66.929000,2
 66.933000,0
 67.083000,1
 67.227000,0
+67.231000,2
 67.366000,1
+67.538000,2
 67.686000,0
 67.993000,1
 68.120000,0
 68.291000,1
 68.425000,0
 68.588000,1
+68.726000,2
 68.884000,0
 69.191000,1
 69.321000,0
+69.323000,2
 69.629000,0
 69.630000,1
 69.692000,1
 69.754000,1
 69.837000,1
 69.911000,1
+69.921000,2
 70.017000,1
 70.065000,0
 70.068000,1
diff --git a/dataset/eval/enst/drummer_2_116_minus-one_rock-60s_sticks.csv b/dataset/eval/enst/drummer_2_116_minus-one_rock-60s_sticks.csv
index 261be10ca3d33345e053d3d0640383e141f5d41a..6bd9e1bf91a808a7dbb7382ae80483ccdc32cb4a 100644
--- a/dataset/eval/enst/drummer_2_116_minus-one_rock-60s_sticks.csv
+++ b/dataset/eval/enst/drummer_2_116_minus-one_rock-60s_sticks.csv
@@ -1,78 +1,190 @@
 onset_time_s,class_5
 0.033000,0
 0.482000,1
+0.483000,2
+0.708000,2
+0.946000,2
 0.948000,0
+1.167000,2
 1.399000,1
+1.400000,2
+1.610000,2
 1.844000,0
+1.847000,2
+2.071000,2
 2.296000,1
+2.298000,2
+2.520000,2
 2.751000,0
+2.753000,2
+2.981000,2
 3.210000,1
+3.211000,2
+3.442000,2
 3.669000,0
+3.671000,2
+3.900000,2
 4.136000,1
+4.139000,2
+4.379000,2
 4.598000,0
+4.600000,2
+4.827000,2
 5.061000,1
+5.064000,2
+5.303000,2
 5.522000,0
+5.527000,2
+5.759000,2
 5.991000,1
+5.994000,2
 6.220000,0
+6.222000,2
 6.458000,0
+6.460000,2
 6.691000,1
+6.924000,3
 6.925000,1
 7.142000,0
 7.374000,0
+7.381000,2
+7.834000,2
 7.848000,1
+8.077000,2
 8.316000,0
+8.320000,2
+8.548000,2
 8.782000,1
+8.785000,2
+9.014000,2
 9.245000,0
+9.250000,2
+9.474000,2
 9.710000,1
+9.711000,2
+9.936000,2
 10.167000,0
+10.168000,2
+10.388000,2
 10.629000,1
+10.631000,2
 10.848000,0
+10.853000,2
 11.082000,0
+11.085000,2
+11.306000,2
 11.540000,1
+11.541000,2
+11.761000,2
 12.000000,0
+12.002000,2
+12.229000,2
 12.463000,1
+12.466000,2
+12.699000,2
 12.930000,0
+12.932000,2
+13.155000,2
 13.404000,1
+13.406000,2
 13.624000,0
+13.626000,2
 13.855000,0
+13.857000,2
+14.079000,2
 14.314000,1
+14.315000,2
+14.539000,2
 14.773000,0
+14.777000,2
+14.995000,2
 15.229000,1
+15.230000,2
+15.455000,2
 15.682000,0
+15.688000,2
+15.910000,2
 16.150000,1
+16.151000,2
+16.381000,2
 16.607000,0
+16.608000,2
+16.835000,2
 17.069000,1
+17.070000,2
 17.299000,0
+17.306000,2
 17.531000,0
+17.535000,2
+17.762000,2
 18.002000,1
+18.003000,2
+18.232000,2
 18.470000,0
+18.488000,2
+18.698000,2
 18.937000,1
+18.938000,2
+19.166000,2
 19.393000,0
+19.394000,2
+20.391000,2
 20.394000,0
 20.835000,0
+20.836000,2
+21.270000,2
 21.276000,0
 21.500000,1
 21.593000,1
+21.704000,2
 21.717000,1
 21.931000,0
 21.935000,1
 22.156000,0
+22.588000,2
 22.597000,1
 23.066000,0
+23.068000,2
+23.286000,2
 23.528000,1
+23.530000,2
+23.753000,2
 23.990000,0
+23.992000,2
+24.209000,2
 24.444000,1
+24.445000,2
+24.675000,2
 24.903000,0
+24.905000,2
+25.130000,2
 25.363000,1
+25.364000,2
 25.592000,1
+25.593000,2
 25.806000,0
+25.809000,2
+26.037000,2
 26.282000,1
+26.282000,2
+26.506000,2
 26.739000,0
+26.739000,2
+26.963000,2
 27.210000,1
+27.210000,2
+27.437000,2
 27.675000,0
+27.677000,2
+27.900000,2
 28.145000,1
+28.145000,2
+28.372000,2
 28.604000,0
+28.606000,2
+28.829000,2
 29.062000,1
+29.063000,2
 29.301000,1
 29.514000,0
 29.991000,1
@@ -110,15 +222,21 @@ onset_time_s,class_5
 41.948000,1
 42.413000,0
 42.629000,1
+42.629000,2
+42.858000,3
+43.090000,3
+43.334000,3
 43.335000,0
 43.455000,1
 43.565000,1
 43.665000,1
+43.673000,2
 43.794000,1
 44.005000,0
 44.027000,1
 44.252000,0
 44.735000,1
+44.735000,2
 45.213000,0
 45.672000,1
 45.897000,1
@@ -126,6 +244,7 @@ onset_time_s,class_5
 46.585000,1
 47.064000,0
 47.526000,1
+47.526000,2
 47.752000,0
 47.982000,0
 48.439000,1
@@ -134,79 +253,111 @@ onset_time_s,class_5
 49.819000,0
 50.049000,0
 50.271000,1
+50.273000,2
 50.740000,0
+50.742000,2
+51.185000,2
 51.187000,1
 51.337000,1
 51.430000,0
 51.439000,1
 51.541000,1
 51.662000,0
+51.664000,2
 52.129000,1
 52.351000,0
 52.588000,0
 53.051000,1
 53.518000,0
 53.981000,1
+53.982000,2
 54.198000,0
 54.431000,0
 54.883000,1
+54.887000,2
 55.116000,1
 55.334000,0
 55.808000,1
+55.808000,2
 56.264000,0
 56.716000,1
+56.719000,2
 56.943000,0
 57.178000,0
 57.649000,1
+57.650000,2
 58.109000,0
 58.579000,1
+58.579000,2
 58.913000,1
 59.031000,0
 59.159000,1
 59.389000,0
 59.486000,1
+59.487000,2
 59.640000,1
 59.725000,0
+59.930000,2
 60.088000,1
 60.322000,0
 60.431000,1
+60.433000,2
 60.558000,1
 60.663000,0
 60.775000,1
+60.890000,2
 60.899000,0
 61.007000,1
 61.260000,0
+61.346000,2
 61.374000,1
 61.612000,1
+61.613000,2
 61.730000,0
 61.958000,1
 62.062000,0
 62.290000,1
+62.290000,2
 62.473000,0
 62.630000,1
 62.736000,0
 63.196000,1
+63.197000,2
 63.427000,0
 63.654000,0
+63.656000,2
+64.078000,2
 64.119000,1
 64.584000,0
+64.586000,2
+65.015000,2
 65.053000,1
+65.465000,2
 65.506000,0
 65.736000,1
+65.736000,3
+65.738000,2
 65.975000,1
+65.978000,3
 66.194000,1
+66.197000,3
 66.199000,0
 66.430000,0
 66.913000,1
+66.915000,2
 68.340000,0
+68.341000,2
 68.347000,1
 68.790000,1
 68.791000,0
+68.792000,2
 69.226000,0
 69.227000,1
+69.228000,2
 69.355000,1
 69.460000,1
 69.569000,1
+69.682000,2
 69.692000,1
 69.913000,0
 70.156000,0
diff --git a/dataset/eval/enst/drummer_2_117_minus-one_metal_sticks.csv b/dataset/eval/enst/drummer_2_117_minus-one_metal_sticks.csv
index a3bf7076fc7759c81dec278d88390e7d416fd46c..bd829769c069b91260ec64afd4b34b0aeddfb94f 100644
--- a/dataset/eval/enst/drummer_2_117_minus-one_metal_sticks.csv
+++ b/dataset/eval/enst/drummer_2_117_minus-one_metal_sticks.csv
@@ -1,35 +1,61 @@
 onset_time_s,class_5
 0.109000,0
+0.109000,2
 0.760000,1
+0.762000,2
 1.257000,0
 1.386000,0
+1.396000,2
 1.551000,1
+1.696000,2
 1.714000,0
 2.049000,1
+2.050000,2
 2.676000,0
+2.678000,2
 3.335000,1
+3.337000,2
+3.624000,2
 3.813000,1
+3.943000,2
 4.132000,1
+4.274000,2
 4.640000,1
+4.642000,2
+4.959000,2
 5.139000,1
+5.301000,2
 5.321000,0
 5.499000,1
+5.655000,2
 5.672000,0
 6.004000,1
+6.005000,2
+6.335000,2
+6.654000,2
 6.681000,0
 6.851000,1
+7.020000,2
 7.030000,0
 7.374000,1
+7.375000,2
 7.716000,0
+7.716000,2
 7.896000,1
 8.060000,0
+8.062000,2
 8.262000,1
+8.390000,2
 8.400000,0
 8.749000,1
+8.750000,2
+9.069000,2
 9.242000,0
 9.249000,1
+9.411000,2
 9.418000,0
 9.597000,1
+9.725000,2
 9.762000,0
 9.941000,1
 10.097000,1
@@ -39,167 +65,283 @@ onset_time_s,class_5
 10.591000,1
 10.740000,0
 10.914000,1
+11.048000,2
 11.058000,0
 11.389000,1
+11.391000,2
+11.716000,2
 11.878000,1
 11.884000,0
+12.041000,2
 12.049000,0
 12.217000,1
+12.354000,2
 12.385000,0
 12.552000,0
 12.718000,1
+12.719000,2
+13.039000,2
 13.222000,1
+13.364000,2
 13.383000,0
 13.563000,1
+13.707000,2
 13.713000,0
 14.048000,1
+14.050000,2
+14.345000,2
 14.537000,1
 14.560000,0
 14.717000,0
+14.721000,2
 14.892000,1
+15.042000,2
 15.081000,0
 15.252000,0
 15.393000,1
+15.395000,2
 15.571000,0
+15.721000,2
 15.904000,1
 16.052000,0
+16.056000,2
 16.232000,1
+16.366000,2
 16.389000,0
 16.571000,0
 16.722000,1
+16.723000,2
+17.039000,2
 17.215000,0
+17.383000,2
 17.538000,1
+17.707000,2
 17.723000,0
 17.908000,0
 18.044000,1
+18.045000,2
+18.363000,2
 18.560000,1
 18.705000,0
+18.707000,2
 18.885000,1
+19.013000,2
 19.030000,0
 19.362000,1
+19.364000,2
+19.692000,2
 19.875000,1
 19.977000,0
+20.030000,2
 20.221000,1
+20.348000,2
 20.354000,0
 20.698000,1
+20.698000,2
 20.870000,1
 21.034000,0
 21.036000,1
 21.209000,1
 21.352000,0
 21.544000,1
+21.660000,2
 21.678000,0
 22.020000,1
+22.021000,2
+22.327000,2
 24.090000,0
+24.092000,2
 24.412000,0
+24.418000,2
 24.759000,1
+24.760000,2
+25.050000,2
 25.235000,0
 25.242000,1
 25.409000,0
+25.409000,2
 25.592000,1
+25.712000,2
 25.758000,0
 25.918000,0
 26.079000,1
+26.081000,2
 26.230000,0
+26.402000,2
 26.577000,1
 26.722000,0
+26.728000,2
 26.942000,1
+27.064000,2
 27.065000,0
 27.399000,1
+27.400000,2
+27.703000,2
 27.883000,1
 27.887000,0
 28.056000,0
+28.058000,2
 28.243000,1
+28.370000,2
 28.390000,0
 28.722000,1
+28.723000,2
+29.026000,2
 29.222000,1
 29.360000,0
 29.572000,1
+29.682000,2
 29.702000,0
 30.045000,1
+30.046000,2
+30.367000,2
+30.687000,2
 30.701000,0
 30.825000,1
 30.902000,1
 31.026000,1
+31.133000,3
+31.245000,3
 31.356000,0
+31.356000,3
+31.461000,3
+31.557000,3
 31.582000,0
+31.670000,3
+31.779000,3
+31.878000,3
 31.969000,0
+32.306000,2
 32.671000,1
+32.672000,2
+32.980000,2
 33.196000,0
 33.197000,1
 33.351000,0
+33.352000,2
 33.553000,1
+33.688000,2
 33.696000,0
 34.040000,1
+34.042000,2
+34.379000,2
 34.573000,1
 34.711000,0
+34.718000,2
 34.928000,1
+35.052000,2
 35.065000,0
 35.408000,1
+35.409000,2
+35.731000,2
 35.904000,1
 35.907000,0
 36.071000,0
+36.074000,2
 36.262000,1
+36.404000,2
 36.414000,0
 36.752000,1
+36.752000,2
+37.066000,2
 37.237000,1
 37.404000,0
 37.592000,1
+37.728000,2
 38.096000,1
+38.098000,2
+38.407000,2
 38.585000,1
 38.602000,0
 38.755000,0
+38.761000,2
 38.950000,1
+39.075000,2
 39.093000,0
 39.430000,1
+39.431000,2
+39.748000,2
 39.940000,1
 40.084000,0
+40.085000,2
 40.302000,1
+40.410000,2
 40.774000,1
+40.775000,2
+41.101000,2
 41.285000,1
+41.426000,2
 41.436000,0
 41.767000,0
+41.768000,2
+42.099000,2
 42.114000,1
+42.407000,2
 42.598000,1
 42.746000,0
 42.980000,1
 43.101000,0
+43.103000,3
 43.445000,1
+43.446000,3
+43.765000,3
 43.779000,0
 43.937000,1
 44.089000,0
+44.093000,3
+44.414000,3
 44.420000,0
 44.756000,1
+44.758000,3
 45.077000,0
+45.078000,3
 45.214000,1
 45.380000,0
+45.380000,2
 45.572000,1
 45.705000,0
+45.707000,2
 46.033000,1
+46.034000,2
+46.344000,2
 46.543000,0
 46.543000,1
+46.689000,2
 46.700000,0
 46.881000,1
+47.031000,2
 47.044000,0
+47.373000,2
 47.566000,1
+47.733000,2
 47.735000,1
 47.904000,1
 48.048000,0
+48.383000,2
 48.391000,0
 48.737000,1
+48.739000,2
+49.074000,2
 49.253000,1
 49.263000,0
+49.414000,2
 49.424000,0
 49.618000,1
 49.746000,0
+49.750000,2
 50.097000,1
+50.098000,2
+50.414000,2
 50.621000,1
 50.771000,0
 50.962000,1
+51.105000,2
 51.289000,0
 51.443000,1
 51.455000,1
 51.750000,0
+52.086000,2
+52.453000,2
 52.454000,0
 52.801000,1
 53.141000,0
@@ -207,35 +349,56 @@ onset_time_s,class_5
 53.308000,1
 53.453000,0
 53.654000,1
+53.779000,2
 53.790000,0
 54.139000,1
+54.140000,2
+54.455000,2
 54.650000,1
 54.809000,0
+54.811000,2
 55.019000,1
 55.148000,0
+55.150000,2
 55.487000,1
+55.487000,2
+55.792000,2
 55.962000,0
 55.970000,1
 56.123000,0
+56.130000,2
 56.325000,1
 56.460000,0
+56.461000,2
 56.797000,1
+56.798000,2
 57.098000,0
 57.284000,1
+57.420000,2
 57.632000,1
 57.761000,0
+57.765000,2
 58.104000,1
+58.105000,2
+58.397000,2
 58.583000,1
 58.590000,0
 58.746000,0
+58.747000,2
 58.935000,1
+59.080000,2
 59.084000,0
 59.414000,1
+59.415000,2
 59.746000,0
 59.934000,1
+60.072000,2
 60.248000,1
+60.391000,2
 60.398000,0
 60.743000,1
+60.744000,2
+61.067000,2
 61.247000,0
 61.251000,1
 61.406000,0
@@ -246,13 +409,27 @@ onset_time_s,class_5
 62.093000,1
 62.260000,1
 62.418000,0
+62.753000,3
+63.085000,3
+63.425000,3
+63.580000,3
+63.749000,3
 64.082000,0
 64.428000,0
+64.434000,2
 64.772000,1
+64.773000,2
+65.093000,2
 65.270000,0
 65.430000,0
+65.431000,2
+65.769000,2
 65.775000,0
 66.129000,1
+66.131000,2
+66.431000,2
 66.630000,0
 66.638000,1
+66.765000,2
+67.129000,2
 67.130000,0
diff --git a/dataset/eval/enst/drummer_2_118_minus-one_musette_brushes.csv b/dataset/eval/enst/drummer_2_118_minus-one_musette_brushes.csv
index 55014069da3dc793c1b6bddf8635760877d37d25..770745d40b13f6f78b73383089fcc88860d93b98 100644
--- a/dataset/eval/enst/drummer_2_118_minus-one_musette_brushes.csv
+++ b/dataset/eval/enst/drummer_2_118_minus-one_musette_brushes.csv
@@ -1,10 +1,15 @@
 onset_time_s,class_5
+3.700000,2
+4.384000,2
 4.387000,0
+4.677000,2
 4.702000,1
 5.004000,1
 5.132000,1
+5.137000,2
 5.579000,1
 5.582000,0
+5.979000,2
 6.908000,1
 6.918000,0
 7.308000,1
@@ -19,92 +24,114 @@ onset_time_s,class_5
 9.464000,0
 9.874000,1
 10.304000,1
+10.312000,2
 10.751000,1
 10.774000,0
 11.175000,1
 11.459000,1
+11.599000,2
 11.604000,1
 12.028000,1
 12.047000,0
 12.475000,1
 12.852000,1
+12.864000,2
 13.328000,1
 13.329000,0
 13.769000,1
 14.042000,1
+14.168000,2
 14.170000,1
 14.600000,1
 14.608000,0
 15.035000,1
 15.335000,1
 15.464000,1
+15.469000,2
 15.753000,0
 15.912000,1
 16.364000,1
+16.738000,2
 16.754000,1
 17.194000,1
 17.198000,0
 17.653000,1
 18.030000,1
+18.047000,2
 18.350000,1
 18.500000,1
 18.913000,1
 19.188000,1
 19.328000,1
+19.331000,2
 19.606000,1
 19.607000,0
 19.761000,1
 20.184000,1
+20.184000,2
 20.419000,1
 20.474000,1
 20.529000,1
 20.610000,0
 20.615000,1
 21.047000,0
+21.891000,2
 21.908000,1
 22.329000,1
 22.337000,0
 22.767000,1
 23.002000,1
 23.179000,1
+23.183000,2
 23.600000,0
 24.047000,1
 24.335000,1
 24.491000,1
+24.500000,2
 24.763000,0
 24.921000,1
+25.310000,2
 25.324000,1
 25.588000,1
 25.754000,1
 26.185000,0
 26.630000,1
 27.037000,1
+27.045000,2
 27.490000,1
 27.505000,0
 27.896000,1
 28.186000,1
 28.328000,1
+28.338000,2
 28.630000,0
 28.787000,1
 29.214000,1
+29.623000,2
 29.634000,1
 29.913000,1
 29.922000,0
 30.070000,1
 30.357000,1
 30.499000,1
+30.787000,2
+30.949000,2
 31.366000,0
 31.826000,1
 32.093000,1
 32.209000,1
+32.212000,2
 32.501000,0
 32.670000,1
 33.109000,1
 33.498000,1
+33.501000,2
 33.897000,0
 33.919000,1
 34.313000,1
+34.317000,2
 34.723000,1
+35.139000,2
 35.143000,0
 35.164000,1
 35.585000,1
@@ -112,106 +139,131 @@ onset_time_s,class_5
 36.432000,1
 36.437000,0
 36.856000,1
+36.856000,2
 37.297000,1
 37.744000,1
 37.748000,0
+38.178000,2
 38.179000,1
 38.603000,1
 39.026000,0
 39.044000,1
 39.486000,1
+39.488000,2
 39.898000,1
 40.332000,0
 40.333000,1
+40.750000,2
 40.766000,1
 41.041000,1
 41.195000,1
 41.612000,0
 42.031000,1
+42.033000,2
 42.310000,1
 42.461000,1
 42.873000,1
 42.876000,0
+43.307000,2
 43.308000,1
 43.729000,1
 44.182000,1
 44.189000,0
 44.646000,1
+44.649000,2
 45.067000,1
 45.479000,1
 45.485000,0
+45.894000,2
 45.917000,1
 46.330000,1
 46.748000,0
 47.192000,1
 47.569000,1
+47.569000,2
 47.851000,1
 47.996000,1
 48.005000,0
 48.454000,1
+48.837000,2
 48.840000,1
 49.276000,1
 49.285000,0
 49.705000,1
 49.990000,1
+50.114000,2
 50.117000,1
 50.413000,1
 50.422000,0
 50.579000,1
 51.020000,1
+51.024000,2
 51.267000,1
+51.424000,2
 51.447000,1
 51.765000,0
 51.906000,0
 52.384000,1
 52.796000,1
+52.807000,2
 53.243000,1
 53.271000,0
 53.673000,1
 54.076000,1
+54.082000,2
 54.346000,1
 54.483000,1
 54.489000,0
 54.906000,1
 55.319000,1
+55.324000,2
 55.606000,1
 55.754000,1
 55.766000,0
 56.189000,1
 56.456000,1
+56.584000,2
 56.587000,1
 57.020000,0
 57.478000,1
+57.884000,2
 57.899000,1
 58.305000,1
 58.312000,0
 58.735000,1
 59.159000,1
+59.162000,2
 59.588000,1
 59.592000,0
 60.021000,1
 60.430000,1
+60.430000,2
 60.868000,1
 60.880000,0
 61.309000,1
 61.559000,1
+61.759000,2
 61.790000,1
 62.203000,0
 62.694000,1
 63.121000,1
+63.146000,2
 63.405000,1
 63.568000,1
 63.587000,0
 63.974000,1
 64.232000,1
+64.377000,2
 64.380000,1
 64.665000,0
 64.804000,1
+65.219000,2
 65.239000,1
 65.509000,1
 65.637000,1
 65.918000,0
 66.067000,1
+66.473000,2
 66.476000,1
 66.723000,1
 66.873000,1
@@ -219,18 +271,22 @@ onset_time_s,class_5
 67.297000,0
 67.727000,1
 67.985000,1
+68.116000,2
 68.119000,1
 68.528000,1
 68.533000,0
 68.955000,1
+69.387000,2
 69.390000,1
 69.817000,1
 69.829000,0
 70.258000,1
+70.693000,2
 70.713000,1
 71.152000,1
 71.166000,0
 71.610000,1
+72.040000,2
 72.043000,1
 72.339000,1
 72.475000,1
diff --git a/dataset/eval/enst/drummer_2_119_minus-one_funky_sticks.csv b/dataset/eval/enst/drummer_2_119_minus-one_funky_sticks.csv
index 4268f21491249634bbd5a186d0285d40756c53d4..08f2c2d992abe65abd6c2d41c6c76e6d44a1ec29 100644
--- a/dataset/eval/enst/drummer_2_119_minus-one_funky_sticks.csv
+++ b/dataset/eval/enst/drummer_2_119_minus-one_funky_sticks.csv
@@ -1,43 +1,87 @@
 onset_time_s,class_5
+0.070000,2
 0.074000,0
+0.657000,2
 0.658000,1
 0.893000,0
 1.179000,0
+1.181000,2
+1.470000,2
 1.736000,1
+1.736000,2
 1.957000,0
+1.996000,2
+2.260000,2
 2.264000,0
+2.552000,2
+2.832000,2
 2.833000,1
+3.115000,2
 3.228000,1
 3.381000,0
+3.383000,2
+3.663000,2
 3.803000,1
 3.938000,1
 4.070000,1
 4.328000,0
 4.449000,0
+5.006000,2
 5.015000,1
 5.405000,1
 5.546000,0
+5.548000,2
+5.826000,2
+6.090000,2
 6.092000,1
+6.351000,2
 6.485000,1
 6.613000,0
+6.622000,2
 6.752000,1
+6.903000,2
 7.171000,1
+7.306000,2
 7.385000,0
+7.434000,2
+7.562000,2
 7.706000,0
+7.710000,2
+7.847000,2
+7.981000,2
 7.983000,0
 8.228000,1
+8.384000,2
 8.475000,0
+8.514000,2
+8.647000,2
 8.781000,0
+8.782000,2
+8.923000,2
+9.058000,2
 9.328000,1
+9.726000,2
 9.727000,0
 9.871000,0
+9.875000,2
+10.159000,2
 10.428000,1
+10.559000,2
 10.624000,0
+10.714000,2
+10.836000,2
 10.983000,0
+10.985000,2
+11.259000,2
+11.396000,2
 11.532000,1
 11.720000,0
+11.804000,2
+11.921000,2
 12.077000,0
+12.079000,2
 12.209000,1
+12.339000,2
 12.480000,0
 12.613000,1
 12.739000,1
@@ -45,115 +89,326 @@ onset_time_s,class_5
 12.874000,1
 13.006000,1
 13.139000,0
+13.396000,2
 13.704000,1
+13.706000,2
 14.112000,0
 14.256000,0
+14.260000,2
+14.533000,2
 14.813000,1
+15.102000,2
+15.221000,2
 15.350000,0
+15.357000,2
+15.491000,2
+15.622000,2
+15.770000,2
 15.888000,1
+16.162000,2
+16.294000,2
 16.427000,0
+16.430000,2
+16.529000,2
+16.597000,2
+16.684000,2
+16.768000,2
+16.864000,2
 16.980000,1
 17.184000,0
+17.247000,2
 17.529000,0
+17.530000,2
+17.665000,2
+17.803000,2
+17.936000,2
 18.081000,1
+18.222000,2
+18.347000,2
+18.479000,2
 18.612000,0
+18.614000,2
+18.886000,2
 19.147000,1
+19.282000,2
 19.420000,0
+19.422000,2
+19.563000,2
 19.694000,0
+19.695000,2
+19.827000,2
+19.968000,2
+20.115000,2
 20.232000,1
+20.368000,2
 20.406000,0
+20.511000,2
+20.643000,2
 20.773000,0
+20.777000,2
+20.903000,2
+21.047000,2
+21.192000,2
 21.320000,1
+21.450000,2
 21.545000,0
 21.597000,1
 21.720000,1
 21.863000,0
+22.125000,2
 22.428000,1
+22.429000,2
+22.705000,2
+22.834000,2
 22.836000,0
 22.971000,0
+22.976000,2
 23.253000,0
+23.255000,2
 23.521000,1
+23.801000,2
+23.936000,2
 24.071000,0
+24.076000,2
+24.212000,2
+24.347000,2
 24.609000,1
+24.884000,2
+25.019000,2
 25.153000,0
+25.155000,2
+25.291000,2
+25.436000,2
+25.575000,2
 25.707000,1
+25.842000,2
+25.985000,2
+26.123000,2
 26.261000,0
+26.263000,2
+26.397000,2
+26.534000,2
 26.803000,1
+26.956000,2
+27.082000,2
+27.217000,2
 27.355000,0
+27.357000,2
+27.503000,2
+27.629000,2
+27.761000,2
 27.889000,1
+28.031000,2
+28.156000,2
+28.300000,2
 28.436000,0
+28.438000,2
+28.557000,2
+28.698000,2
+28.857000,2
 28.963000,1
+29.111000,2
+29.236000,2
+29.375000,2
+29.517000,2
 29.522000,0
+29.645000,2
+29.789000,2
+29.921000,2
 30.064000,1
 30.341000,0
 30.342000,1
 30.474000,1
 30.600000,0
+30.866000,2
 31.162000,1
+31.163000,2
+31.424000,2
 31.573000,1
 31.696000,0
+31.701000,2
 31.830000,1
+31.970000,2
 32.250000,1
+32.253000,2
+32.519000,2
 32.790000,0
+32.792000,2
+32.919000,2
 32.952000,1
+33.058000,2
 33.343000,1
+33.344000,2
+33.481000,2
+33.619000,2
 33.751000,1
 33.885000,0
+33.887000,2
+34.035000,2
+34.160000,2
+34.428000,2
 34.429000,1
+34.693000,2
 34.852000,1
 34.978000,0
+34.980000,2
+35.244000,2
+35.375000,2
 35.508000,1
+35.508000,2
+35.786000,2
+35.916000,2
 36.058000,0
+36.061000,2
 36.207000,1
+36.333000,2
 36.607000,1
+36.608000,2
+36.884000,2
+37.035000,2
 37.154000,0
+37.162000,2
 37.326000,1
+37.433000,2
 37.705000,1
+37.707000,2
+37.980000,2
 38.125000,1
 38.255000,1
 38.267000,0
+38.515000,2
 38.653000,1
+38.775000,2
 38.780000,1
 39.049000,0
+39.061000,3
 39.325000,0
+39.591000,2
+39.860000,2
 39.873000,1
+40.146000,2
+40.281000,2
 40.418000,0
+40.420000,2
+40.689000,2
 40.967000,1
+41.245000,2
 41.515000,0
+41.521000,2
+41.651000,2
+41.791000,2
+41.942000,2
+42.058000,2
 42.059000,1
+42.339000,2
 42.458000,0
 42.602000,0
+42.607000,2
+42.738000,2
+42.876000,2
 42.881000,0
 43.152000,1
+43.297000,2
+43.441000,2
+43.581000,2
 43.710000,0
+43.717000,2
+43.844000,2
+43.983000,2
+44.132000,2
 44.252000,1
+44.253000,2
+44.387000,2
+44.515000,2
+44.655000,2
+44.787000,2
 44.788000,0
+45.052000,2
+45.194000,2
 45.325000,1
+45.478000,2
+45.612000,2
+45.742000,2
 45.876000,0
+45.879000,2
+46.147000,2
 46.416000,1
+46.558000,2
+46.702000,2
+46.834000,2
 46.971000,0
+46.974000,2
+47.102000,2
 47.248000,0
+47.252000,2
 47.517000,1
+47.660000,2
 47.741000,0
 47.788000,1
 47.917000,1
 48.056000,0
+48.324000,2
 48.617000,1
+48.618000,2
+48.776000,2
+48.897000,2
+49.028000,2
 49.165000,0
+49.167000,2
+49.307000,2
+49.437000,2
+49.578000,2
 49.702000,1
+49.850000,2
 49.975000,0
+49.977000,2
+50.252000,2
 50.253000,0
+50.385000,2
+50.525000,2
 50.782000,1
+50.919000,2
+51.071000,2
+51.187000,2
 51.339000,0
+51.341000,2
+51.460000,2
+51.610000,2
+51.752000,2
 51.866000,1
+52.008000,2
+52.142000,2
+52.277000,2
 52.299000,0
 52.421000,0
+52.425000,2
+52.557000,2
+52.694000,2
 52.964000,1
+53.098000,2
+53.241000,2
+53.377000,2
 53.514000,0
+53.516000,2
+53.640000,2
+53.788000,2
+53.930000,2
 54.055000,1
+54.340000,2
+54.461000,2
 54.601000,0
+54.603000,2
+54.734000,2
+54.877000,2
+55.023000,2
 55.140000,1
+55.288000,2
+55.418000,2
+55.548000,2
 55.689000,0
+55.689000,2
+55.823000,2
+55.950000,2
 56.084000,1
 56.213000,1
 56.219000,0
@@ -163,19 +418,58 @@ onset_time_s,class_5
 56.626000,1
 56.760000,1
 56.767000,0
+57.035000,2
+57.306000,2
 57.324000,1
+57.458000,2
+57.602000,2
+57.721000,2
 57.730000,0
 57.858000,0
+57.866000,2
+58.135000,2
 58.403000,1
+58.539000,2
+58.684000,2
+58.810000,2
 58.951000,0
+58.954000,2
+59.224000,2
 59.496000,1
+59.497000,2
+59.639000,2
+59.781000,2
 59.908000,0
+59.910000,2
 60.039000,0
+60.043000,2
+60.183000,2
+60.322000,2
+60.454000,2
 60.597000,1
+60.872000,2
+61.002000,2
 61.156000,0
+61.158000,2
+61.286000,2
+61.424000,2
+61.571000,2
 61.698000,1
+61.836000,2
+61.978000,2
 62.107000,0
+62.107000,2
 62.238000,0
+62.242000,2
+62.379000,2
+62.516000,2
+62.648000,2
 62.780000,1
+63.058000,2
+63.174000,2
 63.311000,0
+63.313000,2
+63.444000,2
+63.588000,2
+63.721000,2
 63.850000,1
diff --git a/dataset/eval/enst/drummer_2_120_minus-one_funk_sticks.csv b/dataset/eval/enst/drummer_2_120_minus-one_funk_sticks.csv
index 8b160ee69bfefb4093da0a6cfefdda57971f7f66..9aeaf73715dd88099ea3bf86701aa826e89ed7fd 100644
--- a/dataset/eval/enst/drummer_2_120_minus-one_funk_sticks.csv
+++ b/dataset/eval/enst/drummer_2_120_minus-one_funk_sticks.csv
@@ -1,179 +1,458 @@
 onset_time_s,class_5
+0.104000,2
 0.118000,0
+1.828000,2
+2.249000,2
 2.659000,1
+2.666000,2
+3.059000,2
+3.448000,2
 3.455000,0
+3.911000,2
+4.083000,2
 4.336000,1
+4.337000,2
+4.759000,2
+4.980000,2
 5.201000,0
+5.202000,2
+5.654000,2
+5.863000,2
 5.871000,0
 6.088000,1
+6.089000,2
+6.289000,2
+6.498000,2
+6.701000,2
 6.794000,1
 6.855000,1
 6.937000,0
+6.943000,2
+7.166000,2
+7.376000,2
+7.572000,2
 7.577000,0
 7.805000,1
+7.805000,2
+8.013000,2
+8.226000,2
+8.405000,2
 8.413000,0
+8.638000,2
+8.820000,2
 8.825000,0
+9.029000,2
 9.030000,0
+9.241000,2
 9.460000,1
+9.464000,2
+9.665000,2
+9.882000,2
 9.975000,1
+10.094000,2
 10.196000,1
 10.240000,1
 10.329000,0
+10.332000,2
+10.559000,2
+10.799000,2
 11.013000,0
+11.015000,2
 11.232000,1
+11.234000,2
+11.432000,2
 11.511000,1
 11.551000,1
 11.578000,1
 11.604000,1
+11.646000,2
+11.833000,2
 11.834000,0
+12.061000,2
+12.257000,2
 12.277000,0
 12.490000,0
+12.490000,2
+12.933000,2
 12.935000,1
+13.119000,2
 13.364000,1
+13.365000,2
 13.574000,1
 13.779000,0
+14.210000,2
 14.215000,0
 14.659000,1
+14.661000,2
+15.077000,2
+15.281000,2
 15.283000,0
+15.498000,2
+15.699000,2
 15.713000,0
 15.915000,0
+15.916000,2
+16.330000,2
 16.336000,1
+16.544000,2
+16.763000,2
+16.973000,2
 17.084000,1
 17.139000,1
 17.206000,0
+17.210000,2
+17.429000,2
+17.648000,2
+17.841000,2
 17.849000,0
 18.072000,1
+18.076000,2
+18.282000,2
 18.369000,1
 18.430000,1
 18.454000,1
 18.468000,1
+18.504000,2
 18.706000,0
+18.706000,2
+18.927000,2
+19.130000,2
 19.147000,0
+19.351000,2
 19.356000,0
+19.557000,2
 19.786000,1
+19.786000,2
+19.989000,2
 20.093000,1
+20.187000,2
 20.401000,1
 20.592000,0
+20.595000,2
+20.799000,2
+21.018000,2
 21.022000,0
+21.223000,2
 21.437000,1
+21.440000,2
+21.661000,2
+21.873000,2
+22.088000,2
 22.092000,0
+22.310000,2
+22.514000,2
 22.519000,0
 22.752000,0
+22.752000,2
+22.958000,2
 23.191000,1
+23.191000,2
+23.389000,2
 23.616000,1
+23.616000,2
+23.817000,2
+24.041000,2
 24.042000,0
 24.070000,1
 24.093000,1
 24.111000,1
 24.131000,1
 24.140000,1
+24.250000,2
 24.365000,0
+24.465000,2
 24.670000,0
 24.900000,1
+24.902000,2
+25.110000,2
+25.336000,2
+25.552000,2
 25.775000,0
+25.776000,2
+25.991000,3
+26.224000,3
+26.431000,3
+26.662000,3
+26.872000,3
+27.096000,3
 27.306000,0
 27.527000,0
+27.940000,2
+28.133000,2
 28.362000,1
+28.364000,2
+28.777000,2
+28.994000,2
 28.995000,1
 28.998000,0
 29.215000,0
+29.217000,2
+29.424000,2
+29.644000,2
 29.860000,0
 30.076000,1
+30.079000,2
+30.284000,2
 30.453000,1
+30.498000,2
+30.698000,2
 30.929000,0
+30.930000,2
+31.143000,2
+31.370000,2
 31.576000,0
 31.788000,1
+31.789000,2
+31.992000,2
 32.159000,1
+32.225000,2
 32.423000,0
+32.425000,2
+32.650000,2
+32.857000,2
 32.861000,0
 33.074000,0
+33.076000,2
+33.266000,2
 33.491000,1
+33.492000,2
+33.699000,2
+33.927000,2
+34.140000,2
 34.367000,0
+34.367000,2
+34.580000,2
+34.801000,2
+34.999000,2
 35.002000,0
 35.210000,1
+35.212000,2
+35.426000,2
 35.430000,1
 35.470000,1
 35.533000,1
 35.559000,1
+35.646000,2
+35.838000,2
 35.840000,0
+36.071000,2
+36.276000,2
 36.289000,0
 36.496000,0
+36.498000,2
+36.931000,2
 36.933000,1
+37.140000,2
+37.356000,2
+37.568000,2
 37.707000,1
 37.787000,0
+37.789000,2
+38.006000,2
+38.227000,2
 38.424000,0
+38.424000,2
 38.647000,1
+38.649000,2
+38.858000,2
 38.938000,1
+39.073000,2
+39.283000,2
 39.287000,0
 39.502000,0
+39.504000,2
+39.717000,2
+39.930000,2
 40.138000,0
+40.141000,2
 40.360000,1
+40.360000,2
+40.563000,2
 40.786000,1
+40.787000,2
 41.005000,1
 41.215000,0
 41.216000,1
+41.650000,2
 42.076000,1
+42.077000,2
+42.285000,2
+42.494000,2
+42.692000,2
 42.693000,0
+42.907000,2
+43.119000,2
 43.124000,0
 43.338000,0
+43.339000,2
+43.550000,2
+43.760000,2
 43.762000,1
+43.969000,2
+44.176000,2
+44.416000,2
+44.476000,2
+44.537000,2
 44.625000,0
+44.631000,2
+44.847000,2
+45.062000,2
+45.271000,2
 45.272000,0
 45.475000,1
+45.476000,2
+45.682000,2
+45.889000,2
 46.297000,0
+46.299000,2
+46.412000,2
+46.509000,2
+46.593000,2
+46.720000,2
+46.830000,2
+46.924000,2
+47.051000,2
 47.185000,1
+47.596000,2
+48.032000,2
 48.052000,0
+48.281000,2
+48.490000,2
 48.697000,0
+48.698000,2
 48.926000,1
+48.927000,2
+49.132000,2
+49.349000,2
 49.555000,0
+49.557000,2
 49.762000,0
+49.764000,2
+49.979000,2
 50.198000,0
+50.204000,2
+50.412000,2
+50.617000,2
 50.621000,1
+50.827000,2
+51.060000,2
+51.279000,2
 51.498000,0
+51.499000,2
+51.719000,2
+51.931000,2
+52.140000,2
 52.142000,0
 52.361000,1
+52.362000,2
+52.571000,2
+52.788000,2
+52.983000,2
 52.985000,0
+53.200000,2
+53.417000,2
 53.426000,0
+53.632000,2
 53.637000,0
+53.842000,2
 54.065000,1
+54.065000,2
+54.282000,3
+54.494000,3
 54.713000,0
 54.926000,0
+55.349000,2
 55.785000,1
+55.787000,2
+56.215000,2
 56.426000,1
 56.427000,0
+56.427000,2
 56.453000,1
 56.477000,1
 56.513000,1
 56.545000,1
 56.567000,1
 56.633000,0
+56.634000,2
+56.857000,2
 57.059000,0
+57.063000,2
+57.486000,2
 57.489000,1
+57.697000,2
+57.917000,2
+58.125000,2
 58.346000,0
+58.353000,2
+58.791000,2
 59.000000,0
 59.220000,1
+59.221000,2
+59.428000,2
+59.640000,2
+59.858000,2
 59.865000,0
+60.081000,2
 60.086000,0
+60.283000,2
+60.511000,2
 60.716000,0
 60.933000,1
+60.934000,2
 61.013000,1
 61.129000,0
+61.360000,2
+61.572000,2
+61.804000,2
 61.809000,0
+62.013000,2
+62.227000,2
 62.433000,0
 62.660000,1
+62.661000,2
+62.859000,2
+63.074000,2
+63.280000,2
 63.283000,0
 63.503000,0
+63.507000,2
+63.708000,2
+63.930000,2
+64.126000,2
 64.131000,0
+64.340000,2
 64.343000,1
+64.544000,2
+64.772000,2
+64.983000,2
 65.205000,0
+65.207000,2
+65.409000,2
+65.638000,2
 65.849000,0
 66.063000,1
+66.064000,2
+66.268000,2
+66.486000,2
+66.712000,2
 66.717000,0
+66.936000,2
 66.938000,0
 67.154000,1
+67.370000,2
+67.575000,2
 67.586000,0
 67.803000,1
+67.803000,2
+68.005000,3
+68.229000,3
 68.655000,0
+69.106000,2
 69.529000,1
+69.529000,2
+69.964000,2
+70.169000,2
 70.184000,0
+70.394000,2
 70.397000,0
diff --git a/dataset/eval/enst/drummer_2_121_minus-one_charleston_sticks.csv b/dataset/eval/enst/drummer_2_121_minus-one_charleston_sticks.csv
index 06e340c30586d36d8f8ec0444988a2edfde3b259..f99f51262a5c1c3b8080a71fbd7f0c1573cf20ae 100644
--- a/dataset/eval/enst/drummer_2_121_minus-one_charleston_sticks.csv
+++ b/dataset/eval/enst/drummer_2_121_minus-one_charleston_sticks.csv
@@ -1,6 +1,7 @@
 onset_time_s,class_5
 0.073000,1
 0.085000,0
+0.387000,2
 0.398000,1
 0.430000,1
 0.474000,1
@@ -11,6 +12,7 @@ onset_time_s,class_5
 0.648000,1
 0.683000,1
 0.697000,0
+0.961000,2
 0.972000,1
 0.996000,1
 1.020000,1
@@ -20,6 +22,7 @@ onset_time_s,class_5
 1.182000,1
 1.263000,1
 1.277000,0
+1.545000,2
 1.555000,1
 1.615000,1
 1.667000,1
@@ -27,6 +30,7 @@ onset_time_s,class_5
 1.800000,1
 1.841000,0
 1.841000,1
+2.102000,2
 2.116000,1
 2.175000,1
 2.233000,1
@@ -36,6 +40,7 @@ onset_time_s,class_5
 2.415000,0
 2.453000,1
 2.500000,1
+2.677000,2
 2.713000,1
 2.761000,1
 2.807000,1
@@ -49,6 +54,7 @@ onset_time_s,class_5
 3.077000,1
 3.159000,1
 3.228000,1
+3.257000,2
 3.275000,1
 3.312000,1
 3.371000,1
@@ -59,13 +65,16 @@ onset_time_s,class_5
 3.580000,1
 3.594000,1
 3.620000,1
+3.701000,2
 3.709000,1
 3.742000,1
 3.791000,1
 3.818000,1
+3.823000,2
 3.887000,1
 3.977000,1
 4.041000,1
+4.125000,2
 4.138000,0
 4.147000,1
 4.192000,1
@@ -80,11 +89,13 @@ onset_time_s,class_5
 4.702000,0
 4.848000,1
 4.982000,1
+4.983000,2
 5.019000,1
 5.083000,1
 5.164000,1
 5.275000,1
 5.276000,0
+5.553000,2
 5.557000,1
 5.611000,1
 5.678000,1
@@ -92,6 +103,7 @@ onset_time_s,class_5
 5.814000,1
 5.849000,1
 5.860000,0
+6.134000,2
 6.147000,1
 6.224000,1
 6.305000,1
@@ -99,6 +111,7 @@ onset_time_s,class_5
 6.441000,1
 6.451000,0
 6.467000,1
+6.726000,2
 6.735000,1
 6.755000,1
 6.804000,1
@@ -108,6 +121,7 @@ onset_time_s,class_5
 7.004000,1
 7.045000,0
 7.045000,1
+7.312000,2
 7.314000,1
 7.382000,1
 7.437000,1
@@ -116,6 +130,7 @@ onset_time_s,class_5
 7.614000,1
 7.618000,0
 7.794000,1
+7.878000,2
 7.888000,1
 7.930000,1
 7.977000,1
@@ -127,10 +142,12 @@ onset_time_s,class_5
 8.311000,1
 8.372000,1
 8.456000,1
+8.457000,2
 8.592000,1
 8.659000,1
 8.737000,0
 8.745000,1
+8.748000,2
 8.868000,1
 8.949000,1
 9.013000,0
@@ -140,6 +157,7 @@ onset_time_s,class_5
 9.219000,1
 9.314000,0
 9.314000,1
+9.596000,2
 9.601000,1
 9.657000,1
 9.741000,1
@@ -148,6 +166,7 @@ onset_time_s,class_5
 9.892000,1
 9.894000,0
 9.916000,1
+10.177000,2
 10.179000,1
 10.249000,1
 10.307000,1
@@ -156,6 +175,7 @@ onset_time_s,class_5
 10.480000,0
 10.490000,1
 10.749000,1
+10.749000,2
 10.775000,1
 10.824000,1
 10.888000,1
@@ -164,6 +184,7 @@ onset_time_s,class_5
 11.067000,0
 11.068000,1
 11.082000,1
+11.341000,2
 11.350000,1
 11.390000,1
 11.466000,1
@@ -171,6 +192,7 @@ onset_time_s,class_5
 11.582000,1
 11.637000,1
 11.646000,0
+11.918000,2
 11.925000,1
 11.968000,1
 12.014000,1
@@ -179,6 +201,7 @@ onset_time_s,class_5
 12.151000,1
 12.209000,1
 12.216000,0
+12.479000,2
 12.486000,1
 12.525000,1
 12.577000,1
@@ -186,6 +209,7 @@ onset_time_s,class_5
 12.702000,1
 12.775000,0
 12.775000,1
+13.056000,2
 13.061000,1
 13.105000,1
 13.169000,1
@@ -196,8 +220,10 @@ onset_time_s,class_5
 13.639000,1
 13.648000,0
 13.817000,1
+13.892000,2
 13.927000,0
 13.932000,1
+14.188000,2
 14.206000,1
 14.258000,1
 14.319000,1
@@ -205,6 +231,7 @@ onset_time_s,class_5
 14.504000,0
 14.504000,1
 14.632000,1
+14.783000,2
 14.793000,1
 14.838000,1
 14.899000,1
@@ -213,6 +240,7 @@ onset_time_s,class_5
 15.082000,1
 15.091000,0
 15.352000,0
+15.355000,2
 15.367000,1
 15.413000,1
 15.468000,1
@@ -220,6 +248,7 @@ onset_time_s,class_5
 15.596000,1
 15.660000,1
 15.669000,0
+15.933000,2
 15.943000,0
 15.947000,1
 15.996000,1
@@ -230,6 +259,7 @@ onset_time_s,class_5
 16.385000,1
 16.461000,1
 16.533000,0
+16.538000,2
 16.549000,1
 16.577000,1
 16.594000,1
@@ -247,16 +277,19 @@ onset_time_s,class_5
 17.270000,1
 17.378000,1
 17.387000,0
+17.416000,2
 17.664000,0
 17.677000,1
 17.837000,1
 17.956000,1
 17.963000,0
 18.130000,1
+18.131000,2
 18.248000,0
 18.252000,1
 18.538000,0
 18.805000,0
+18.837000,2
 18.840000,1
 18.884000,1
 18.963000,1
@@ -275,6 +308,7 @@ onset_time_s,class_5
 20.179000,1
 20.286000,1
 20.287000,0
+20.553000,2
 20.565000,1
 20.617000,1
 20.693000,1
@@ -282,6 +316,7 @@ onset_time_s,class_5
 20.857000,0
 20.871000,1
 21.128000,0
+21.140000,2
 21.146000,1
 21.206000,1
 21.256000,1
@@ -290,6 +325,7 @@ onset_time_s,class_5
 21.439000,1
 21.446000,0
 21.708000,0
+21.729000,2
 21.733000,1
 21.784000,1
 21.830000,1
@@ -321,6 +357,7 @@ onset_time_s,class_5
 23.110000,1
 23.150000,0
 23.151000,1
+23.450000,2
 23.454000,1
 23.499000,1
 23.566000,1
@@ -329,6 +366,7 @@ onset_time_s,class_5
 23.749000,1
 23.750000,0
 23.766000,1
+24.025000,2
 24.037000,1
 24.089000,1
 24.152000,1
@@ -337,6 +375,7 @@ onset_time_s,class_5
 24.329000,1
 24.334000,0
 24.594000,0
+24.599000,2
 24.618000,1
 24.663000,1
 24.710000,1
@@ -344,6 +383,7 @@ onset_time_s,class_5
 24.832000,1
 24.907000,1
 24.908000,0
+25.168000,2
 25.180000,1
 25.182000,0
 25.232000,1
@@ -352,6 +392,7 @@ onset_time_s,class_5
 25.398000,1
 25.479000,1
 25.480000,0
+25.734000,2
 25.747000,0
 25.767000,1
 25.816000,1
@@ -360,6 +401,7 @@ onset_time_s,class_5
 25.995000,1
 26.056000,0
 26.056000,1
+26.318000,2
 26.333000,0
 26.333000,1
 26.384000,1
@@ -371,6 +413,7 @@ onset_time_s,class_5
 26.747000,1
 26.826000,1
 26.900000,0
+26.912000,2
 26.919000,1
 27.192000,0
 27.203000,1
@@ -380,6 +423,7 @@ onset_time_s,class_5
 27.763000,1
 27.770000,0
 28.043000,0
+28.062000,2
 28.067000,1
 28.120000,1
 28.172000,1
@@ -387,6 +431,7 @@ onset_time_s,class_5
 28.300000,1
 28.341000,1
 28.346000,0
+28.634000,2
 28.636000,1
 28.686000,1
 28.747000,1
@@ -395,6 +440,7 @@ onset_time_s,class_5
 28.927000,1
 28.934000,0
 28.959000,1
+29.214000,2
 29.220000,1
 29.278000,1
 29.339000,1
@@ -402,6 +448,7 @@ onset_time_s,class_5
 29.447000,1
 29.522000,0
 29.522000,1
+29.786000,2
 29.789000,1
 29.809000,1
 29.850000,1
@@ -412,6 +459,7 @@ onset_time_s,class_5
 30.101000,0
 30.108000,1
 30.378000,0
+30.378000,2
 30.379000,1
 30.401000,1
 30.436000,1
@@ -421,6 +469,7 @@ onset_time_s,class_5
 30.660000,1
 30.674000,0
 30.949000,0
+30.959000,2
 30.960000,1
 30.999000,1
 31.060000,1
@@ -429,6 +478,7 @@ onset_time_s,class_5
 31.254000,1
 31.258000,0
 31.516000,0
+31.522000,2
 31.533000,1
 31.819000,0
 31.826000,1
@@ -436,78 +486,193 @@ onset_time_s,class_5
 32.094000,1
 32.095000,0
 32.390000,0
+32.392000,2
 32.660000,0
+32.664000,2
 32.953000,0
+32.953000,2
+33.253000,2
+33.461000,2
 33.545000,0
+33.547000,2
+33.842000,2
+34.027000,2
 34.118000,0
+34.120000,2
+34.400000,2
+34.598000,2
+34.696000,2
 34.697000,0
+34.988000,2
+35.166000,2
 35.265000,0
+35.268000,2
+35.555000,2
+35.733000,2
 35.833000,0
+35.836000,2
+36.128000,2
+36.304000,2
 36.409000,0
+36.412000,2
+36.711000,2
+36.884000,2
 36.999000,0
+37.000000,2
+37.296000,2
+37.476000,2
 37.571000,0
+37.578000,2
 37.856000,0
+37.877000,2
+38.051000,2
 38.163000,0
+38.165000,2
 38.446000,0
+38.447000,2
+38.624000,2
 38.731000,0
+38.736000,2
+39.016000,2
+39.202000,2
 39.307000,0
+39.308000,2
+39.594000,2
+39.803000,2
 39.877000,0
+39.884000,2
 40.136000,0
+40.170000,2
+40.338000,2
 40.453000,0
+40.455000,2
 40.708000,0
+40.732000,2
+40.930000,2
 41.019000,0
+41.021000,2
+41.308000,2
 41.312000,0
+41.486000,2
+41.595000,2
 41.596000,0
 41.884000,0
+41.897000,2
+42.078000,2
 42.174000,0
+42.181000,2
 42.466000,0
+42.473000,2
+42.651000,2
+42.753000,2
 42.755000,0
 43.049000,0
+43.052000,2
+43.242000,2
 43.332000,0
+43.338000,2
 43.632000,0
+43.640000,2
 43.916000,0
+43.918000,2
 44.200000,0
+44.209000,2
+44.399000,2
 44.487000,0
+44.496000,2
 44.782000,0
+44.794000,2
+44.979000,2
 45.064000,0
+45.068000,2
 45.342000,0
+45.364000,2
+45.547000,2
 45.636000,0
+45.641000,2
 45.913000,0
+45.929000,2
 46.212000,0
+46.213000,2
 46.501000,0
+46.526000,2
+46.700000,2
 46.793000,0
+46.795000,2
 47.092000,0
+47.094000,2
+47.288000,2
 47.381000,0
+47.385000,2
 47.660000,0
+47.676000,2
+47.877000,2
 47.958000,0
+47.969000,2
 48.248000,0
+48.253000,2
+48.440000,2
 48.526000,0
+48.541000,2
 48.834000,0
+48.840000,2
+49.020000,2
+49.121000,2
 49.122000,0
+49.410000,2
 49.417000,0
+49.601000,2
 49.691000,0
+49.696000,2
 49.971000,0
+49.984000,2
+50.180000,2
 50.262000,0
+50.273000,2
 50.551000,0
+50.556000,2
+50.742000,2
 50.831000,0
+50.839000,2
+51.133000,2
 51.134000,0
+51.320000,2
 51.410000,0
+51.415000,2
 51.701000,0
+51.713000,2
+51.896000,2
 51.979000,0
+51.990000,2
 52.272000,0
+52.287000,2
+52.459000,2
 52.565000,0
+52.569000,2
 52.854000,0
+52.867000,2
+53.042000,2
 53.134000,0
+53.150000,2
 53.437000,0
+53.452000,2
+53.629000,2
 53.725000,0
+53.728000,2
 54.000000,0
+54.019000,2
+54.198000,2
 54.288000,0
+54.289000,2
 54.474000,1
 54.560000,0
 54.565000,1
 54.847000,0
 54.855000,1
+54.871000,2
 55.124000,0
+55.132000,2
+55.418000,2
 55.426000,0
 55.713000,0
 55.739000,1
@@ -519,6 +684,7 @@ onset_time_s,class_5
 55.932000,1
 55.996000,1
 56.009000,0
+56.290000,2
 56.292000,1
 56.309000,0
 56.317000,1
@@ -529,6 +695,7 @@ onset_time_s,class_5
 56.554000,1
 56.610000,0
 56.614000,1
+56.884000,2
 56.906000,0
 56.909000,1
 56.968000,1
@@ -538,6 +705,7 @@ onset_time_s,class_5
 57.156000,1
 57.194000,0
 57.195000,1
+57.456000,2
 57.478000,0
 57.487000,1
 57.540000,1
@@ -546,6 +714,7 @@ onset_time_s,class_5
 57.716000,1
 57.768000,1
 57.772000,0
+58.054000,2
 58.062000,1
 58.065000,0
 58.109000,1
@@ -574,6 +743,7 @@ onset_time_s,class_5
 59.645000,1
 59.686000,1
 59.737000,1
+59.767000,2
 59.770000,1
 59.795000,0
 59.838000,1
@@ -600,6 +770,7 @@ onset_time_s,class_5
 61.213000,1
 61.228000,1
 61.231000,0
+61.487000,2
 61.511000,1
 61.524000,0
 61.566000,1
@@ -609,6 +780,7 @@ onset_time_s,class_5
 61.795000,0
 61.795000,1
 61.940000,1
+62.047000,2
 62.079000,1
 62.084000,0
 62.138000,1
@@ -617,6 +789,7 @@ onset_time_s,class_5
 62.323000,1
 62.368000,1
 62.372000,0
+62.609000,2
 62.654000,1
 62.663000,0
 62.708000,1
@@ -627,6 +800,7 @@ onset_time_s,class_5
 63.008000,1
 63.076000,1
 63.134000,1
+63.210000,2
 63.218000,1
 63.238000,0
 63.287000,1
@@ -656,6 +830,7 @@ onset_time_s,class_5
 64.564000,1
 64.674000,1
 64.676000,0
+64.972000,2
 64.973000,1
 64.980000,0
 65.026000,1
@@ -664,6 +839,7 @@ onset_time_s,class_5
 65.227000,1
 65.271000,0
 65.273000,1
+65.517000,2
 65.557000,1
 65.565000,0
 65.616000,1
@@ -672,6 +848,7 @@ onset_time_s,class_5
 65.813000,1
 65.857000,1
 65.858000,0
+66.135000,2
 66.136000,1
 66.151000,0
 66.194000,1
@@ -680,6 +857,7 @@ onset_time_s,class_5
 66.396000,1
 66.431000,1
 66.438000,0
+66.713000,2
 66.717000,1
 66.737000,0
 66.783000,1
@@ -688,6 +866,7 @@ onset_time_s,class_5
 66.957000,1
 67.013000,1
 67.014000,0
+67.285000,2
 67.288000,1
 67.311000,0
 67.350000,1
@@ -696,6 +875,7 @@ onset_time_s,class_5
 67.541000,1
 67.585000,0
 67.589000,1
+67.849000,2
 67.868000,1
 67.871000,0
 67.926000,1
@@ -703,6 +883,7 @@ onset_time_s,class_5
 68.060000,1
 68.155000,0
 68.155000,1
+68.417000,2
 68.421000,1
 68.441000,0
 68.492000,1
@@ -713,6 +894,7 @@ onset_time_s,class_5
 68.951000,1
 69.003000,0
 69.003000,1
+69.004000,2
 69.139000,1
 69.224000,1
 69.297000,0
@@ -724,6 +906,7 @@ onset_time_s,class_5
 69.883000,0
 69.884000,1
 70.032000,1
+70.154000,2
 70.160000,0
 70.164000,1
 70.303000,1
diff --git a/dataset/eval/enst/drummer_2_122_minus-one_celtic-rock_sticks.csv b/dataset/eval/enst/drummer_2_122_minus-one_celtic-rock_sticks.csv
index 4180632b3b02691ec30664e560375ccae5e99936..bff2bbe372b0445ea06b120c9dd8d3093769986b 100644
--- a/dataset/eval/enst/drummer_2_122_minus-one_celtic-rock_sticks.csv
+++ b/dataset/eval/enst/drummer_2_122_minus-one_celtic-rock_sticks.csv
@@ -1,167 +1,230 @@
 onset_time_s,class_5
+2.871000,2
 2.894000,0
 3.240000,1
 3.594000,1
+3.707000,2
 4.003000,1
 4.149000,0
+4.554000,2
 4.825000,1
 5.034000,1
 5.292000,1
+5.420000,2
 5.438000,0
+5.855000,2
 5.875000,1
+6.279000,2
 6.294000,1
 6.552000,1
+6.687000,2
 6.719000,0
+7.132000,2
 7.148000,1
 7.550000,1
+7.551000,2
+7.942000,2
 7.970000,0
+8.384000,2
 8.440000,1
+8.823000,2
 8.828000,1
 9.118000,1
+9.237000,2
 9.261000,0
+9.684000,2
 9.715000,1
+10.124000,2
 10.129000,1
 10.386000,1
 10.576000,0
+10.990000,2
 11.035000,1
+11.432000,2
 11.438000,1
 11.530000,1
 11.590000,1
 11.662000,1
 11.736000,1
 11.775000,1
+11.860000,2
 11.885000,0
 11.889000,1
 12.164000,1
+12.293000,2
 12.323000,1
 12.380000,1
 12.441000,1
 12.532000,1
 12.614000,1
 12.698000,1
+12.725000,2
 12.783000,1
 12.899000,1
 12.981000,1
 13.066000,1
+13.144000,2
 13.183000,0
+13.587000,2
 13.900000,1
 14.034000,1
+14.038000,2
 14.351000,1
+14.439000,2
 14.477000,0
+14.875000,2
 14.888000,1
 15.126000,1
+15.315000,2
 15.328000,1
 15.506000,1
+15.727000,2
 15.748000,0
+16.137000,2
 16.146000,1
 16.560000,1
+16.565000,2
 17.009000,0
+17.420000,2
 17.456000,1
 17.674000,1
 17.903000,0
 18.115000,1
 18.328000,0
 18.632000,1
+18.755000,2
 19.027000,1
+19.183000,2
 19.433000,1
+19.585000,2
 19.607000,0
 19.895000,1
+20.017000,2
 20.295000,1
+20.429000,2
 20.640000,1
+20.826000,2
 20.867000,0
 21.050000,1
+21.268000,2
 21.561000,1
+21.710000,2
 21.915000,1
 22.008000,0
 22.142000,0
 22.428000,1
+22.564000,2
 22.736000,1
 22.843000,0
 23.285000,1
 23.439000,0
 23.700000,1
 23.851000,1
+23.857000,2
 24.133000,0
+24.290000,2
 24.295000,1
 24.536000,1
 24.736000,0
 25.017000,1
+25.139000,2
 25.441000,0
+25.565000,2
 25.836000,1
+25.993000,2
 26.027000,0
 27.984000,1
 28.024000,1
+28.135000,2
 28.161000,1
 28.453000,1
 28.602000,0
 28.604000,1
 28.902000,1
+29.010000,2
 29.043000,1
 29.294000,1
 29.296000,0
+29.425000,2
 29.430000,1
 29.783000,1
+29.843000,2
 29.870000,0
 29.879000,1
 29.940000,1
 30.031000,1
 30.097000,1
 30.156000,1
+30.265000,2
 30.275000,1
 30.538000,1
 30.550000,0
+30.692000,2
 30.702000,1
 30.959000,1
 31.129000,1
 31.133000,0
 31.406000,1
+31.555000,2
 31.576000,1
 31.837000,0
 31.861000,1
 31.920000,1
+31.975000,2
 31.992000,1
 32.081000,1
 32.146000,1
 32.220000,1
 32.316000,1
 32.400000,1
+32.426000,2
 32.474000,0
 32.475000,1
 32.745000,1
+32.882000,2
 32.911000,1
 33.156000,0
 33.181000,1
 33.234000,1
+33.307000,2
 33.313000,1
 33.388000,1
 33.456000,1
 33.523000,1
 33.603000,1
 33.684000,1
+33.752000,2
 33.784000,0
 33.785000,1
 34.037000,1
 34.176000,1
+34.182000,2
 34.438000,0
 34.569000,1
+34.597000,2
+34.989000,2
 34.999000,1
 35.005000,0
 35.067000,1
 35.122000,1
 35.231000,1
 35.342000,1
+35.395000,2
 35.421000,1
 35.494000,1
 35.591000,1
 35.652000,0
 35.655000,1
 35.697000,1
+35.783000,2
 35.790000,1
 35.912000,1
 36.024000,1
+36.212000,2
 36.260000,0
 36.260000,1
 36.561000,1
+36.672000,2
 36.742000,1
 36.799000,1
 36.864000,1
@@ -172,56 +235,115 @@ onset_time_s,class_5
 37.220000,1
 37.296000,1
 37.482000,1
+37.581000,2
 37.610000,0
 37.611000,1
 37.883000,1
+38.025000,2
 38.041000,1
 38.289000,0
 38.317000,1
+38.420000,2
 38.429000,1
+38.830000,2
+39.256000,2
+39.688000,2
+40.177000,2
+40.598000,2
+41.045000,2
+41.456000,2
+41.887000,2
+42.308000,2
+42.739000,2
 42.765000,0
+43.165000,2
 43.175000,1
+43.588000,2
+44.048000,2
+44.473000,2
 44.501000,0
 44.731000,1
+44.872000,2
 44.910000,0
+45.283000,2
+45.698000,2
+46.132000,2
+46.561000,2
+46.988000,2
 47.018000,0
+47.423000,2
 47.657000,1
+47.819000,2
+48.272000,2
+48.693000,2
 48.736000,0
+49.145000,2
+49.570000,2
 49.609000,1
 49.611000,0
 49.727000,1
 49.968000,1
+50.021000,2
+50.454000,2
+50.866000,2
 51.304000,0
+51.312000,2
 51.615000,1
 51.725000,0
+51.726000,2
+51.929000,2
 51.933000,1
 52.159000,0
 52.241000,1
+52.344000,2
 52.465000,1
+52.555000,2
 52.580000,0
+52.771000,2
 52.793000,1
+52.986000,2
 53.011000,0
+53.204000,2
 53.309000,1
+53.424000,2
 53.437000,0
 53.620000,1
+53.629000,2
+53.870000,2
 53.872000,1
 53.874000,0
+54.098000,2
 54.220000,1
 54.309000,0
+54.309000,2
+54.524000,2
+54.753000,2
 54.754000,0
 54.892000,1
 55.106000,1
 55.194000,0
 55.322000,1
+55.404000,2
 55.631000,0
+55.631000,2
+55.872000,2
+56.078000,2
+56.293000,2
 56.295000,0
 56.406000,1
 56.507000,0
+56.509000,2
+56.930000,2
 57.128000,0
+57.142000,2
 57.264000,1
 57.363000,0
+57.366000,2
 57.496000,1
 57.768000,0
+57.769000,2
+57.991000,2
 57.992000,1
 57.995000,0
 58.210000,0
+58.210000,2
diff --git a/dataset/eval/enst/drummer_2_123_minus-one_celtic-rock-better-take_sticks.csv b/dataset/eval/enst/drummer_2_123_minus-one_celtic-rock-better-take_sticks.csv
index 6874b1f62d9ca6debd6ba30d54e56c24f7b8faad..83fbe35d7673cb2a29603e1b9aab7b339442e56f 100644
--- a/dataset/eval/enst/drummer_2_123_minus-one_celtic-rock-better-take_sticks.csv
+++ b/dataset/eval/enst/drummer_2_123_minus-one_celtic-rock-better-take_sticks.csv
@@ -1,94 +1,342 @@
 onset_time_s,class_5
 0.094000,0
+1.361000,2
 1.381000,0
+1.773000,2
+2.206000,2
 2.215000,1
 2.484000,1
+2.600000,2
 2.634000,0
 3.903000,0
+4.345000,2
+4.469000,2
+4.561000,2
+4.640000,2
+4.754000,2
 4.921000,0
+5.066000,2
 5.182000,0
+5.182000,2
+5.419000,2
+5.513000,2
+5.613000,2
+5.729000,2
+5.839000,2
 5.844000,0
+5.948000,2
+6.050000,2
+6.163000,2
+6.254000,2
+6.355000,2
 6.464000,0
+6.466000,2
+6.790000,2
+6.899000,2
+6.997000,2
 7.108000,0
+7.110000,2
+7.209000,2
 7.257000,0
+7.313000,2
+7.427000,2
 7.539000,0
+7.637000,2
 7.741000,0
+7.742000,2
+7.855000,2
+7.964000,2
+8.063000,2
+8.173000,2
+8.282000,2
 8.395000,0
+8.491000,2
+8.610000,3
+8.711000,2
+8.929000,2
 9.034000,0
+9.035000,2
+9.143000,2
+9.253000,2
+9.359000,2
+9.476000,2
+9.576000,2
+9.691000,2
 9.692000,0
+9.790000,2
+9.883000,2
 9.911000,1
 10.069000,0
 10.346000,0
+10.347000,2
+10.571000,2
+10.686000,2
+10.789000,2
+10.899000,2
 11.005000,0
+11.114000,2
+11.217000,2
+11.326000,2
 11.426000,0
+11.530000,2
 11.627000,0
+11.642000,2
+11.751000,2
+11.858000,2
+11.968000,2
+12.068000,2
+12.177000,2
+12.283000,2
 12.284000,0
+12.383000,2
 12.486000,1
+12.598000,2
+12.694000,2
 12.701000,0
+12.806000,2
 12.907000,0
+12.909000,2
+13.036000,2
+13.237000,2
+13.341000,2
+13.451000,2
+13.552000,2
 13.562000,0
+13.670000,2
+13.769000,2
+13.866000,2
+13.974000,2
+14.081000,2
 14.182000,0
+14.183000,2
+14.291000,2
+14.402000,2
+14.507000,2
+14.607000,2
+14.715000,2
+14.813000,2
 14.821000,0
+14.918000,2
+15.046000,3
+15.151000,2
+15.247000,2
 15.474000,0
+15.477000,2
+15.591000,2
+15.718000,2
+15.817000,2
+15.929000,2
+16.033000,2
+16.135000,2
 16.137000,0
+16.251000,2
 16.277000,0
+16.357000,2
+16.462000,2
 16.560000,0
+16.560000,2
+16.677000,2
 16.777000,0
+16.779000,2
+16.896000,2
+16.990000,2
+17.102000,2
 17.191000,0
+17.205000,2
 17.415000,0
+17.417000,2
+17.531000,2
+17.624000,2
+17.733000,2
+17.830000,2
 17.832000,0
+17.921000,2
+18.037000,2
 18.049000,0
+18.247000,2
+18.349000,2
+18.454000,2
 18.464000,0
+18.668000,2
 18.676000,0
+18.875000,2
+18.983000,2
 19.075000,0
+19.077000,2
+19.193000,2
+19.302000,2
 19.304000,0
+19.620000,2
 19.728000,0
+19.730000,2
+19.840000,2
 19.951000,0
+19.951000,2
+20.067000,2
+20.172000,2
+20.275000,2
 20.378000,0
+20.382000,2
+20.481000,2
+20.605000,2
 20.608000,0
+20.720000,2
 20.759000,0
+20.840000,2
+20.937000,2
 21.043000,0
+21.043000,2
+21.146000,2
 21.264000,1
+21.378000,2
+21.482000,2
+21.583000,2
 21.683000,0
+21.684000,2
+21.811000,2
 21.903000,0
+21.905000,2
+22.019000,2
+22.120000,2
+22.235000,2
 22.330000,0
+22.334000,2
+22.437000,2
 22.547000,0
+22.549000,2
+22.757000,2
+22.869000,2
+22.965000,2
 22.972000,0
+23.067000,2
+23.183000,2
 23.194000,0
+23.306000,2
+23.399000,2
+23.509000,2
 23.608000,0
+23.610000,2
+23.725000,2
 23.815000,0
+23.822000,2
+23.930000,2
+24.041000,2
+24.144000,2
 24.213000,0
+24.242000,2
+24.464000,2
 24.473000,0
+24.571000,2
+24.678000,2
+24.791000,2
 24.904000,0
+25.003000,2
+25.106000,2
 25.113000,0
+25.313000,2
+25.430000,2
+25.528000,2
 25.530000,0
+25.644000,2
+25.748000,2
 25.749000,0
+26.072000,2
+26.178000,2
+26.288000,2
 26.386000,0
+26.388000,2
+26.517000,2
+26.620000,2
+26.725000,2
+26.823000,2
+26.942000,2
 27.048000,0
+27.050000,2
+27.164000,2
+27.273000,2
+27.379000,2
+27.474000,2
+27.578000,2
 27.677000,0
+27.683000,2
+27.795000,2
+27.907000,2
+27.998000,2
+28.101000,2
+28.205000,2
+28.311000,2
 28.321000,0
 28.470000,0
+28.515000,2
+28.737000,2
 28.739000,0
 28.958000,0
+28.958000,2
 29.116000,0
+29.162000,2
 29.360000,0
+29.361000,2
 29.591000,0
+29.595000,2
 30.016000,0
+30.022000,2
 30.246000,0
+30.248000,2
+30.447000,2
+30.664000,2
 30.679000,0
 30.903000,0
 31.263000,0
+31.334000,2
+31.441000,2
 31.546000,0
+31.548000,2
+31.767000,2
+31.878000,2
 31.901000,0
+31.970000,2
+32.080000,2
+32.190000,2
 32.193000,0
+32.409000,2
+32.510000,2
+32.610000,2
+32.721000,2
 32.809000,0
+32.825000,2
+32.933000,2
+33.035000,2
+33.137000,2
 33.232000,0
+33.237000,2
+33.346000,2
 33.449000,0
+33.454000,2
+33.667000,2
+33.791000,2
 33.888000,0
+33.895000,2
+34.009000,2
+34.113000,2
+34.232000,2
 34.329000,0
+34.331000,2
+34.431000,2
+34.538000,2
+34.645000,2
 34.750000,0
+34.752000,2
+34.966000,2
+35.080000,2
+35.181000,2
 35.187000,0
+35.295000,2
+35.406000,2
 35.410000,0
+35.507000,2
+35.620000,2
+35.723000,2
+35.820000,2
 35.833000,0
 36.057000,0
 36.319000,1
@@ -99,143 +347,299 @@ onset_time_s,class_5
 37.308000,0
 37.516000,1
 37.698000,1
+37.701000,2
 38.139000,1
+38.147000,2
 38.493000,1
+38.586000,2
 38.624000,0
+39.021000,2
 39.057000,0
+39.451000,2
 39.480000,0
 39.889000,1
+39.891000,2
 40.229000,1
+40.313000,2
 40.341000,0
+40.747000,2
 40.978000,0
 41.094000,1
+41.172000,2
 41.196000,0
 41.538000,1
+41.615000,2
 41.843000,0
 41.947000,1
+42.034000,2
 42.368000,1
+42.457000,2
 42.465000,0
 42.577000,1
 42.788000,1
+42.879000,2
 42.900000,0
 43.111000,1
 43.221000,1
+43.318000,2
 43.436000,1
 43.554000,0
 43.651000,1
 43.735000,1
+43.737000,2
 44.084000,1
+44.160000,2
 44.186000,0
 44.511000,1
+44.598000,2
 44.621000,0
 44.934000,1
 44.972000,0
+45.041000,2
 45.274000,0
+45.465000,2
 45.597000,1
 45.790000,1
 45.909000,0
+45.909000,2
 46.104000,1
 46.212000,1
+46.295000,2
 46.308000,0
 46.613000,0
+46.698000,2
 46.825000,1
 46.944000,0
 47.039000,1
+47.143000,2
 47.269000,1
 47.596000,1
+47.604000,2
 47.795000,0
 47.931000,1
+48.032000,2
 48.049000,0
 48.381000,0
+48.472000,2
 48.568000,1
 48.695000,0
 48.784000,1
+48.899000,2
 49.004000,1
 49.330000,1
+49.331000,2
 49.339000,0
 49.668000,1
+49.760000,2
 49.775000,0
 50.041000,1
 50.099000,0
+50.179000,2
 50.298000,1
 50.433000,0
 50.508000,1
+50.624000,2
 50.729000,1
 50.928000,0
 50.930000,1
+51.028000,2
 51.141000,1
 51.236000,0
 51.341000,1
+51.424000,2
 51.443000,0
 51.755000,1
 51.756000,0
+51.861000,2
 51.984000,1
 52.078000,0
 52.204000,1
+52.296000,2
 52.418000,1
 52.610000,0
+52.712000,2
 52.727000,1
 52.933000,0
+53.127000,2
 53.147000,0
 53.454000,0
+53.553000,2
 53.660000,1
 53.801000,0
 53.919000,1
+54.000000,2
 54.148000,1
 54.358000,0
+54.447000,2
 54.448000,1
 54.676000,0
 54.786000,1
+54.872000,2
 54.895000,0
 55.011000,1
 55.119000,1
 55.204000,0
+55.284000,2
 55.319000,1
 55.425000,1
 55.538000,0
 55.648000,1
+55.737000,2
 55.762000,0
 55.872000,1
 56.090000,0
+56.184000,2
 56.190000,1
 56.367000,0
 56.634000,0
+56.634000,2
+56.851000,2
+56.950000,2
 56.952000,0
+57.068000,2
+57.261000,2
 57.270000,0
+57.375000,2
 57.378000,0
+57.481000,2
+57.595000,2
+57.695000,2
+57.799000,2
 57.801000,0
 57.914000,1
+58.027000,2
 58.050000,0
+58.114000,2
+58.239000,2
+58.337000,2
 58.340000,0
 58.649000,0
+58.744000,2
+58.853000,2
 58.959000,0
+59.060000,2
+59.163000,2
+59.264000,2
+59.359000,2
+59.472000,2
+59.577000,3
+59.676000,2
+59.754000,2
+59.992000,2
 60.004000,0
+60.105000,2
+60.214000,2
+60.325000,2
 60.329000,0
+60.440000,2
+60.661000,2
 60.664000,0
+60.763000,2
+60.883000,2
+60.989000,2
+61.094000,2
+61.212000,2
 61.318000,1
+61.436000,2
 61.451000,0
+61.527000,2
+61.761000,2
 61.765000,0
 62.094000,0
+62.096000,2
+62.196000,2
 62.425000,0
+62.427000,2
+62.518000,2
+62.649000,2
+62.735000,2
+62.856000,2
 62.949000,0
 63.064000,1
+63.159000,2
 63.199000,0
+63.268000,2
+63.479000,2
 63.483000,0
+63.586000,2
+63.681000,2
 63.785000,0
+63.785000,2
+63.902000,2
+64.019000,2
+64.119000,2
 64.122000,0
+64.223000,2
+64.325000,2
+64.441000,2
+64.543000,2
+64.649000,2
 64.754000,1
+64.858000,2
 64.927000,0
+64.967000,2
+65.080000,2
 65.197000,0
+65.525000,2
 65.533000,0
+65.837000,2
 65.840000,0
+65.937000,2
+66.048000,2
+66.159000,2
+66.250000,2
+66.368000,2
 66.472000,1
+66.584000,2
 66.645000,0
+66.790000,2
+66.901000,2
 66.904000,0
+67.003000,2
+67.100000,2
+67.207000,2
+67.330000,3
+67.533000,2
 67.536000,0
+67.649000,2
+67.742000,2
+67.876000,2
+67.966000,3
+68.076000,2
+68.184000,2
+68.286000,2
+68.395000,2
+68.518000,2
+68.627000,2
 68.634000,0
+68.733000,2
+68.835000,2
+68.949000,2
+69.050000,3
 69.261000,0
+69.263000,2
+69.361000,2
+69.466000,2
+69.588000,2
+69.683000,3
+69.801000,2
+69.898000,3
+70.006000,2
 70.048000,0
+70.230000,2
 70.351000,0
+70.556000,2
+70.652000,2
+70.760000,3
 70.939000,0
+70.970000,2
+71.064000,2
+71.177000,2
+71.280000,2
+71.592000,3
+71.697000,2
 71.752000,0
+71.815000,2
+71.917000,2
 72.037000,0
+72.038000,2
diff --git a/dataset/eval/enst/drummer_2_124_minus-one_bossa_sticks.csv b/dataset/eval/enst/drummer_2_124_minus-one_bossa_sticks.csv
index 8badc4f10dbf5a1209dd0c3910c9d54de142f9ff..e99d38575ea641ff37d476f464327a4d51322ef6 100644
--- a/dataset/eval/enst/drummer_2_124_minus-one_bossa_sticks.csv
+++ b/dataset/eval/enst/drummer_2_124_minus-one_bossa_sticks.csv
@@ -1,82 +1,237 @@
 onset_time_s,class_5
+0.036000,2
 0.040000,0
 0.795000,0
+0.797000,2
+1.053000,2
 1.057000,0
+1.307000,2
+1.552000,2
 1.814000,0
+1.815000,2
+2.042000,2
 2.048000,0
+2.300000,2
+2.549000,2
 2.800000,0
+2.802000,2
 3.044000,0
+3.058000,2
+3.301000,2
+3.558000,2
 3.802000,0
+3.805000,2
 4.049000,0
+4.051000,2
+4.296000,2
+4.563000,2
 4.802000,0
+4.808000,2
 5.060000,0
+5.063000,2
+5.330000,2
+5.576000,2
+5.814000,2
 5.827000,0
 6.074000,0
+6.074000,2
+6.327000,2
+6.569000,2
+6.809000,2
 6.811000,0
+7.054000,2
 7.055000,0
+7.296000,2
+7.550000,2
+7.808000,2
 8.062000,0
+8.070000,2
+8.312000,2
+8.574000,2
 8.817000,0
+8.822000,2
+9.060000,2
 9.061000,0
+9.310000,2
+9.572000,2
 9.814000,0
+9.816000,2
 10.063000,0
+10.071000,2
+10.308000,2
+10.576000,2
 10.825000,0
+10.829000,2
 11.073000,0
+11.076000,2
+11.328000,2
+11.586000,2
 11.838000,0
+11.838000,2
+12.070000,2
 12.075000,0
+12.328000,2
+12.587000,2
+12.821000,2
 12.822000,0
 13.071000,0
+13.073000,2
+13.320000,2
+13.576000,2
+13.823000,2
 13.827000,0
+14.067000,2
 14.079000,0
+14.330000,2
+14.587000,2
 14.828000,0
+14.837000,2
 15.075000,0
+15.076000,2
+15.315000,2
+15.587000,2
 15.813000,0
 16.080000,0
+16.581000,2
 16.825000,0
+16.827000,2
 17.072000,0
+17.075000,2
+17.310000,2
+17.579000,2
+17.807000,2
 17.808000,0
+18.054000,2
 18.057000,0
+18.298000,2
+18.564000,2
 18.795000,0
+18.811000,2
 19.044000,0
+19.059000,2
+19.301000,2
+19.555000,2
 19.801000,0
+19.802000,2
 20.056000,0
+20.058000,2
+20.305000,2
+20.569000,2
 20.809000,0
+20.814000,2
+21.053000,2
 21.054000,0
+21.312000,2
+21.562000,2
 21.788000,0
+21.809000,2
+22.051000,2
 22.054000,0
+22.302000,2
+22.566000,2
 22.803000,0
+22.805000,2
 23.051000,0
+23.051000,2
+23.294000,2
+23.543000,2
 23.779000,0
+23.799000,2
 24.044000,0
+24.054000,2
+24.297000,2
+24.555000,2
 24.789000,0
+24.798000,2
 25.035000,0
+25.038000,2
+25.286000,2
+25.536000,2
+25.772000,2
 25.774000,0
 26.022000,0
+26.022000,2
+26.268000,2
+26.523000,2
 26.760000,0
+26.762000,2
 27.009000,0
+27.015000,2
+27.258000,2
+27.511000,2
 27.751000,0
+27.755000,2
+28.015000,2
 28.016000,0
+28.261000,2
+28.536000,2
 28.767000,0
+28.771000,2
 29.024000,0
+29.026000,2
+29.287000,2
+29.553000,2
+29.798000,2
 29.805000,0
+30.057000,2
 30.065000,0
+30.307000,2
+30.565000,2
+30.804000,2
 30.807000,0
 31.059000,0
+31.059000,2
+31.304000,2
+31.559000,2
 31.799000,0
+31.803000,2
 32.047000,0
+32.051000,2
+32.296000,2
+32.554000,2
 32.783000,0
+32.788000,2
 33.041000,0
+33.042000,2
+33.300000,2
+33.560000,2
+33.802000,2
 33.803000,0
+34.044000,2
 34.058000,0
+34.299000,2
+34.561000,2
 34.797000,0
+34.797000,2
 35.050000,0
+35.054000,2
+35.297000,2
+35.547000,2
 35.791000,0
+35.795000,2
 36.055000,0
+36.057000,2
+36.300000,2
+36.559000,2
 36.790000,0
+36.797000,2
 37.052000,0
+37.053000,2
+37.314000,2
+37.562000,2
 37.794000,0
+37.800000,2
 38.046000,0
+38.050000,2
+38.300000,2
+38.558000,2
 38.784000,0
+38.788000,2
 39.039000,0
+39.057000,2
+39.284000,2
+39.531000,2
+39.759000,2
 39.760000,0
 40.022000,0
 40.742000,0
@@ -109,7 +264,9 @@ onset_time_s,class_5
 54.057000,0
 54.784000,0
 55.055000,0
+55.543000,3
 55.789000,0
+55.799000,3
 56.047000,0
 56.764000,0
 57.019000,0
diff --git a/dataset/eval/enst/drummer_2_130_MIDI-minus-one_bigband_sticks.csv b/dataset/eval/enst/drummer_2_130_MIDI-minus-one_bigband_sticks.csv
index f614ed9a103aea3186bbb8fc371573b68023a1b7..b4295678c5f374c1f417afb6b15f3fefb716e260 100644
--- a/dataset/eval/enst/drummer_2_130_MIDI-minus-one_bigband_sticks.csv
+++ b/dataset/eval/enst/drummer_2_130_MIDI-minus-one_bigband_sticks.csv
@@ -1,22 +1,40 @@
 onset_time_s,class_5
 0.281000,1
 0.862000,0
+1.277000,2
 1.351000,1
+4.150000,2
 4.163000,1
 4.479000,1
+4.617000,2
 4.651000,0
+5.081000,2
 5.099000,1
+5.562000,2
 5.593000,0
 5.905000,1
+6.019000,2
+6.487000,2
 6.511000,0
+6.962000,2
 6.978000,1
 7.455000,0
+7.463000,2
 7.912000,1
+7.913000,2
+8.389000,2
 8.858000,1
+8.858000,2
 8.877000,0
+9.335000,2
 9.675000,1
+9.785000,2
 9.796000,0
+10.258000,2
+10.734000,2
 10.740000,0
+11.195000,2
+11.653000,2
 11.671000,1
 11.673000,0
 11.735000,1
@@ -26,26 +44,40 @@ onset_time_s,class_5
 11.928000,1
 11.969000,1
 12.004000,1
+12.121000,2
+12.568000,2
 12.583000,0
+13.037000,2
 13.366000,1
+13.366000,2
 13.863000,1
 13.865000,0
+13.966000,2
 13.995000,0
+14.338000,3
+14.409000,2
 14.480000,1
 14.565000,1
 14.641000,1
 14.734000,1
 14.814000,1
 14.928000,1
+14.936000,2
+15.244000,3
+15.245000,2
 15.402000,1
 15.554000,1
 15.710000,1
+15.864000,2
 15.871000,1
 16.043000,1
+16.194000,3
+16.298000,2
 16.356000,1
 16.574000,1
 16.657000,1
 16.741000,1
+16.787000,2
 16.789000,1
 16.851000,1
 16.936000,1
@@ -54,83 +86,130 @@ onset_time_s,class_5
 17.139000,1
 17.187000,1
 17.255000,1
+17.256000,2
 17.327000,1
 17.393000,1
 17.456000,1
 17.542000,1
 17.775000,0
+17.775000,2
 18.248000,1
 18.261000,0
 18.595000,1
 18.743000,0
+19.184000,2
 19.185000,1
 19.197000,0
 19.512000,1
+19.649000,2
 19.657000,0
 20.107000,1
+20.110000,2
 20.130000,0
+20.563000,2
 20.590000,0
 21.040000,1
+21.041000,2
 21.055000,0
+21.486000,2
 21.499000,0
+21.961000,2
 21.970000,1
 21.980000,0
+22.426000,2
 22.452000,0
+22.912000,2
 22.927000,0
 22.930000,1
+23.367000,2
 23.393000,0
+23.838000,2
 23.864000,0
 24.163000,1
+24.327000,2
 24.345000,0
 24.662000,1
 24.799000,0
+24.802000,2
 25.273000,0
 25.275000,1
+25.716000,2
 25.718000,1
 25.732000,0
 26.196000,0
+26.652000,2
 26.667000,0
+27.096000,2
 27.128000,0
+27.575000,2
 27.602000,0
+28.036000,2
 28.072000,0
 28.413000,1
+28.517000,2
 28.552000,0
 29.022000,0
+29.488000,2
 29.502000,0
+29.953000,2
 29.969000,0
 30.404000,1
+30.406000,2
 30.424000,0
 30.694000,1
+30.878000,2
 30.884000,0
 31.217000,1
 31.336000,1
+31.337000,2
 31.353000,0
 31.720000,1
+31.795000,2
 31.816000,0
 32.154000,1
+32.263000,2
 32.291000,0
+32.739000,2
 32.763000,0
+33.224000,2
 33.227000,1
 33.248000,0
 33.572000,1
+33.681000,2
 33.717000,0
 34.164000,1
+34.166000,2
 34.188000,0
+34.627000,2
 34.653000,0
+35.096000,2
 35.103000,1
 35.115000,0
+35.559000,2
 35.598000,0
+35.883000,2
 35.886000,0
+36.039000,2
+36.496000,2
 36.512000,0
+36.971000,2
 37.005000,0
 37.005000,1
+37.440000,2
 37.471000,0
+37.905000,2
 37.932000,0
 38.248000,1
+38.384000,2
 38.406000,0
 38.771000,1
+38.863000,2
 38.880000,0
+39.339000,2
 39.360000,0
 39.542000,1
+39.677000,3
+39.817000,2
 39.819000,0
+39.821000,3
 40.125000,1
diff --git a/dataset/eval/enst/drummer_2_132_MIDI-minus-one_blues-102_sticks.csv b/dataset/eval/enst/drummer_2_132_MIDI-minus-one_blues-102_sticks.csv
index 8c0f61331869b4eb42658086ac2edaa37b73f68d..31649f09b8ba9ee3854475d7bcfdda0fd78f6915 100644
--- a/dataset/eval/enst/drummer_2_132_MIDI-minus-one_blues-102_sticks.csv
+++ b/dataset/eval/enst/drummer_2_132_MIDI-minus-one_blues-102_sticks.csv
@@ -1,141 +1,265 @@
 onset_time_s,class_5
 2.888000,1
+2.897000,2
+3.226000,2
+3.419000,2
 3.423000,0
 3.557000,1
+3.744000,2
 3.747000,0
 3.971000,1
+3.973000,2
+4.363000,2
 4.580000,0
+4.582000,2
+4.925000,2
 5.137000,0
 5.137000,1
+5.138000,2
+5.518000,2
 5.709000,0
+5.719000,2
 5.900000,1
+6.077000,2
 6.278000,0
 6.280000,1
+6.282000,2
+6.637000,2
 6.840000,0
+6.843000,2
+7.183000,2
 7.397000,1
+7.400000,2
 7.401000,0
+7.777000,2
 7.981000,0
+7.987000,2
 8.167000,1
+8.330000,2
 8.545000,0
+8.549000,2
 8.555000,1
+8.901000,2
 9.117000,0
+9.119000,2
+9.495000,2
 9.500000,1
 9.687000,0
+9.689000,2
 9.694000,1
+10.045000,2
 10.239000,0
+10.245000,2
 10.624000,1
+10.625000,2
 10.804000,0
 10.805000,1
+10.806000,2
+11.157000,2
+11.365000,2
 11.366000,0
+11.750000,2
 11.930000,0
 11.931000,1
+11.932000,2
+12.297000,2
+12.499000,2
 12.501000,0
 12.884000,1
+12.886000,2
 13.068000,0
 13.068000,1
+13.068000,2
+13.421000,2
 13.621000,0
+13.621000,2
 14.009000,1
+14.009000,2
 14.193000,1
 14.194000,0
+14.194000,2
+14.571000,2
 14.776000,0
+14.778000,2
+15.146000,2
 15.148000,1
 15.336000,1
+15.336000,2
 15.353000,0
 15.686000,1
+15.695000,2
 15.901000,0
+15.906000,2
 16.281000,1
+16.281000,2
 16.477000,0
 16.478000,1
+16.479000,2
+16.841000,2
 16.877000,1
+17.042000,2
 17.044000,0
 17.420000,1
+17.421000,2
 17.607000,1
+17.608000,2
 17.609000,0
+17.966000,2
 17.968000,1
 18.170000,0
+18.172000,2
+18.525000,2
 18.526000,1
 18.733000,0
 18.734000,1
+18.735000,2
+19.094000,2
 19.095000,1
 19.303000,0
+19.309000,2
 19.692000,1
+19.692000,2
 19.869000,1
+19.870000,2
 19.890000,0
 20.236000,1
 20.432000,0
+21.005000,2
 21.026000,1
 21.029000,0
+21.393000,2
 21.589000,0
+21.593000,2
 21.950000,1
+21.950000,2
 22.141000,1
+22.142000,2
 22.156000,0
 22.484000,1
+22.489000,2
 22.695000,0
+22.699000,2
 23.072000,1
+23.079000,2
 23.264000,0
 23.269000,1
+23.270000,2
+23.626000,2
 23.826000,0
+23.834000,2
 24.215000,1
+24.216000,2
 24.384000,1
+24.385000,2
 24.388000,0
+24.751000,2
 24.754000,1
 24.948000,0
+24.950000,2
 25.316000,1
+25.319000,2
 25.496000,1
+25.497000,2
 25.519000,0
+25.857000,2
 25.934000,1
 26.079000,0
+26.080000,2
 26.453000,1
+26.455000,2
 26.658000,1
+26.659000,2
 26.662000,0
 27.021000,1
 27.213000,0
+27.789000,2
 27.801000,1
 27.808000,0
+28.165000,2
+28.374000,2
 28.376000,0
 28.743000,1
+28.752000,2
 28.937000,1
+28.938000,2
 28.945000,0
 29.299000,1
+29.302000,2
 29.506000,0
+29.508000,2
 29.867000,1
+29.868000,2
 30.052000,1
+30.053000,2
 30.069000,0
 30.405000,1
+30.405000,2
 30.612000,0
+30.614000,2
 30.993000,1
+30.994000,2
 31.180000,1
+31.181000,2
 31.183000,0
+31.536000,2
 31.544000,1
 31.729000,0
+31.733000,2
 32.125000,1
+32.125000,2
 32.323000,1
+32.324000,2
 32.325000,0
+32.673000,2
 32.681000,1
 32.877000,0
+32.879000,2
 33.254000,1
+33.264000,2
 33.465000,1
+33.466000,2
 33.467000,0
+33.838000,2
 33.842000,1
 34.036000,0
+34.038000,2
 34.390000,1
+34.390000,2
 34.587000,1
+34.588000,2
 34.591000,0
 34.962000,1
+34.966000,2
 35.141000,0
+35.146000,2
 35.320000,1
+35.326000,2
+35.511000,2
 35.519000,1
 35.718000,1
+35.718000,2
 35.723000,0
+36.080000,2
 36.089000,1
 36.278000,0
 36.872000,1
+36.873000,2
 36.875000,0
+37.226000,2
+37.441000,2
 37.444000,0
+37.792000,2
 37.989000,1
+37.990000,2
 38.013000,0
 38.358000,1
+38.358000,2
 38.550000,0
+38.556000,2
+38.913000,2
 39.094000,1
+39.095000,2
 39.113000,0
+39.461000,2
+39.666000,2
 39.668000,0
diff --git a/dataset/eval/enst/drummer_2_134_MIDI-minus-one_country-120_sticks.csv b/dataset/eval/enst/drummer_2_134_MIDI-minus-one_country-120_sticks.csv
index d416031bc851d19d61effc11ac1acbb19db396c5..c91a36898d35faf7304774254d845691afdbb45e 100644
--- a/dataset/eval/enst/drummer_2_134_MIDI-minus-one_country-120_sticks.csv
+++ b/dataset/eval/enst/drummer_2_134_MIDI-minus-one_country-120_sticks.csv
@@ -1,37 +1,175 @@
 onset_time_s,class_5
+4.661000,2
+5.123000,2
 5.128000,0
+5.604000,2
+5.910000,2
 6.100000,0
+6.104000,2
+6.412000,2
+6.613000,2
+6.899000,2
 7.100000,0
+7.102000,2
+7.413000,2
+7.606000,2
+7.916000,2
 8.101000,0
+8.103000,2
+8.426000,2
+8.616000,2
+8.919000,2
 9.112000,0
+9.114000,2
+9.416000,2
+9.600000,2
+9.935000,2
 10.115000,0
+10.124000,2
+10.420000,2
+10.610000,2
+10.902000,2
 11.099000,0
+11.101000,2
+11.410000,2
+11.603000,2
+11.912000,2
 12.092000,0
+12.094000,2
+12.400000,2
+12.602000,2
+12.913000,2
 13.100000,0
+13.101000,2
+13.410000,2
+13.605000,2
+13.929000,2
 14.106000,0
+14.111000,2
+14.408000,2
+14.595000,2
+14.913000,2
 15.103000,0
+15.104000,2
+15.418000,2
+15.609000,2
+15.912000,2
 16.099000,0
+16.100000,2
+16.408000,2
+16.588000,2
+16.916000,2
 17.104000,0
+17.106000,2
+17.412000,2
+17.596000,2
+17.906000,2
 18.097000,0
+18.102000,2
+18.408000,2
+18.595000,2
+18.916000,2
 19.116000,0
+19.116000,2
+19.424000,2
+19.613000,2
+19.924000,2
 20.109000,0
+20.113000,2
+20.425000,2
+20.611000,2
+20.927000,2
+21.110000,2
 21.114000,0
+21.418000,2
+21.602000,2
+21.920000,2
 22.105000,0
+22.110000,2
+22.422000,2
+22.614000,2
+22.918000,2
+23.109000,2
 23.110000,0
+23.423000,2
+23.608000,2
+23.911000,2
 24.099000,0
+24.101000,2
+24.401000,2
+24.599000,2
+24.915000,2
 25.105000,0
+25.107000,2
+25.420000,2
+25.600000,2
+25.916000,2
 26.096000,0
+26.102000,2
+26.398000,2
+26.596000,2
+26.909000,2
 27.089000,0
+27.091000,2
+27.411000,2
+27.601000,2
+27.919000,2
 28.098000,0
+28.100000,2
+28.418000,2
+28.593000,2
+28.932000,2
 29.104000,0
+29.106000,2
+29.423000,2
+29.600000,2
+29.913000,2
 30.106000,0
+30.110000,2
+30.427000,2
+30.613000,2
+30.915000,2
+31.115000,2
 31.116000,0
+31.405000,2
+31.607000,2
 32.099000,0
+32.610000,2
+32.903000,2
 33.098000,0
+33.100000,2
+33.402000,2
+33.590000,2
+33.904000,2
 34.096000,0
+34.099000,2
+34.406000,2
+34.591000,2
+34.911000,2
 35.087000,0
+35.095000,2
+35.415000,2
+35.587000,2
+35.917000,2
 36.101000,0
+36.103000,2
+36.418000,2
+36.611000,2
+36.926000,2
 37.109000,0
+37.111000,2
+37.407000,2
+37.608000,2
+37.921000,2
 38.099000,0
+38.103000,2
+38.406000,2
+38.587000,2
+38.908000,2
 39.083000,0
+39.085000,2
+39.407000,2
+39.572000,2
+39.910000,2
 40.093000,0
+40.095000,2
diff --git a/dataset/eval/enst/drummer_2_136_MIDI-minus-one_disco-108_sticks.csv b/dataset/eval/enst/drummer_2_136_MIDI-minus-one_disco-108_sticks.csv
index 02fe1905ce0056bf4243540e574ba2ab9bf307df..f6743608d62d90dc7c27efd427857f3174b90057 100644
--- a/dataset/eval/enst/drummer_2_136_MIDI-minus-one_disco-108_sticks.csv
+++ b/dataset/eval/enst/drummer_2_136_MIDI-minus-one_disco-108_sticks.csv
@@ -1,104 +1,225 @@
 onset_time_s,class_5
+2.731000,2
 3.019000,0
+3.021000,2
+3.276000,2
 3.530000,1
 3.535000,0
+3.799000,2
+4.064000,2
 4.069000,0
 4.223000,1
+4.328000,2
 4.605000,1
+4.606000,2
 4.608000,0
+4.893000,2
+5.184000,2
 5.192000,0
+5.457000,2
 5.748000,1
+5.749000,2
 5.750000,0
+5.915000,2
+6.038000,2
+6.293000,2
 6.307000,0
+6.583000,2
 6.851000,0
 6.852000,1
+6.853000,2
+7.119000,2
 7.405000,0
+7.419000,2
+7.679000,2
 7.961000,1
+7.963000,2
 8.229000,0
+8.231000,2
 8.501000,0
+8.501000,2
+8.777000,2
 9.060000,1
+9.062000,2
+9.334000,2
 9.610000,0
+9.611000,2
+9.896000,2
 10.174000,1
+10.174000,2
 10.400000,0
+10.453000,2
 10.617000,1
+10.719000,2
 10.722000,0
+11.004000,2
 11.287000,1
+11.287000,2
 11.565000,0
+11.571000,2
 11.844000,0
+11.845000,2
+12.115000,2
+12.396000,2
 12.397000,1
+12.671000,2
 12.817000,1
 12.947000,0
+12.949000,2
+13.232000,2
 13.507000,1
+13.509000,2
+13.781000,2
 13.929000,1
 14.043000,0
+14.051000,2
+14.208000,2
+14.335000,2
+14.620000,2
 14.625000,1
+14.901000,2
 15.057000,1
 15.172000,0
+15.174000,2
+15.456000,2
 15.736000,1
+15.738000,2
 16.010000,0
+16.012000,2
 16.284000,0
+16.286000,2
+16.564000,2
+16.841000,2
 16.843000,1
+17.120000,2
 17.396000,0
+17.396000,2
+17.675000,2
+17.953000,2
 17.954000,1
+18.229000,2
 18.390000,1
 18.501000,0
+18.506000,2
+18.780000,2
 18.784000,0
+19.067000,2
 19.069000,1
+19.346000,2
 19.481000,1
 19.606000,0
+19.610000,2
+19.887000,2
 20.163000,1
 20.168000,0
 20.428000,0
 20.458000,1
 20.597000,1
 20.736000,0
+21.011000,2
 21.305000,1
+21.310000,2
 21.311000,0
+21.592000,2
 21.873000,0
+21.877000,2
+22.147000,2
 22.423000,1
+22.424000,2
 22.634000,0
+22.692000,2
 22.833000,1
 22.965000,0
+22.967000,2
+23.229000,2
 23.500000,1
+23.501000,2
 23.703000,0
+23.775000,2
 23.918000,1
 24.041000,0
+24.043000,2
+24.324000,2
 24.607000,1
+24.608000,2
 24.880000,0
+24.883000,2
 25.035000,1
 25.168000,0
+25.170000,2
+25.449000,2
+25.718000,2
 25.726000,1
+26.004000,2
 26.141000,1
+26.275000,2
 26.276000,0
+26.546000,2
+26.836000,2
 26.840000,1
 27.117000,0
+27.121000,2
 27.396000,0
+27.397000,2
+27.671000,2
+27.951000,2
 27.954000,1
+28.230000,2
 28.385000,1
 28.500000,0
+28.501000,2
+28.776000,2
 29.060000,1
 29.343000,0
 29.343000,1
 29.495000,1
 29.619000,0
+29.899000,2
+30.198000,2
 30.202000,0
 30.202000,1
+30.471000,2
 30.756000,0
+30.758000,2
+31.023000,2
 31.300000,0
 31.301000,1
+31.302000,2
+31.579000,2
 31.855000,0
+31.862000,2
+32.130000,2
 32.414000,0
 32.414000,1
+32.416000,2
+32.687000,2
 32.971000,0
+32.974000,2
+33.242000,2
 33.515000,1
+33.516000,2
 33.517000,0
+33.775000,2
 34.066000,0
+34.068000,2
+34.336000,2
 34.611000,0
 34.611000,1
+34.613000,2
+34.882000,2
 35.164000,0
+35.168000,2
+35.438000,2
 35.722000,1
+35.724000,2
 35.725000,0
+36.004000,2
 36.283000,0
+36.285000,2
+36.558000,2
 36.838000,1
+36.840000,2
 36.841000,0
+37.121000,2
 37.394000,0
+37.396000,2
diff --git a/dataset/eval/enst/drummer_2_138_MIDI-minus-one_funk-101_sticks.csv b/dataset/eval/enst/drummer_2_138_MIDI-minus-one_funk-101_sticks.csv
index 7e8176093ba77af8e881599eee8ea482df681c71..b1744f2f9848bd92f1f92681d05df0cb5466d147 100644
--- a/dataset/eval/enst/drummer_2_138_MIDI-minus-one_funk-101_sticks.csv
+++ b/dataset/eval/enst/drummer_2_138_MIDI-minus-one_funk-101_sticks.csv
@@ -1,111 +1,270 @@
 onset_time_s,class_5
 5.639000,1
 5.792000,1
+5.967000,3
 6.275000,0
+6.560000,2
 6.851000,1
+6.851000,2
 7.084000,0
+7.131000,2
 7.415000,0
+7.419000,2
+7.707000,2
 8.006000,1
+8.007000,2
+8.305000,2
 8.465000,1
 8.600000,0
+8.601000,2
+8.899000,2
+9.201000,2
 9.203000,1
+9.497000,2
 9.795000,0
+9.797000,2
+10.093000,2
 10.385000,1
+10.385000,2
 10.636000,0
+10.676000,2
+10.975000,2
 10.977000,0
+11.284000,2
+11.585000,2
 11.586000,1
+11.749000,2
 11.846000,0
+11.878000,2
 12.186000,0
+12.188000,2
+12.492000,2
 12.798000,1
+12.798000,2
 13.077000,0
+13.098000,2
 13.388000,0
+13.390000,2
+13.690000,2
+13.981000,2
 13.986000,1
+14.149000,2
+14.284000,2
 14.430000,1
 14.570000,0
+14.572000,2
+14.868000,2
+15.169000,2
 15.171000,1
+15.349000,2
+15.470000,2
 15.767000,0
+15.769000,2
+16.068000,2
+16.366000,2
 16.367000,1
+16.664000,2
 16.947000,0
+16.953000,2
+17.249000,2
+17.549000,2
 17.550000,1
+17.840000,2
 18.029000,1
 18.135000,0
+18.137000,2
+18.435000,2
 18.738000,1
+18.740000,2
+19.036000,2
 19.330000,0
+19.332000,2
 19.483000,1
+19.624000,2
 19.796000,1
 19.913000,1
+19.916000,2
 20.210000,0
 20.213000,1
 20.513000,0
+20.811000,2
 21.104000,1
+21.115000,2
+21.261000,2
+21.390000,2
 21.697000,0
+21.698000,2
+21.996000,2
 22.300000,1
+22.300000,2
+22.464000,2
+22.588000,2
 22.786000,1
+22.880000,2
 22.888000,0
+23.067000,2
 23.097000,1
+23.183000,2
 23.493000,1
+23.494000,2
+23.793000,2
 23.964000,1
 24.082000,0
+24.083000,2
+24.372000,2
 24.669000,1
+24.670000,2
+24.846000,2
+24.968000,2
 25.269000,0
+25.271000,2
+25.565000,2
+25.865000,2
 25.868000,1
+26.027000,2
+26.160000,2
 26.448000,0
+26.450000,2
+26.753000,2
 27.051000,1
+27.053000,2
+27.227000,2
+27.348000,2
 27.523000,1
 27.646000,0
+27.648000,2
+27.944000,2
 28.247000,1
+28.253000,2
+28.411000,2
+28.533000,2
 28.719000,1
 28.843000,0
+28.847000,2
 29.000000,1
+29.135000,2
 29.307000,1
+29.416000,2
 29.424000,1
 29.719000,0
 29.720000,1
 30.016000,0
+30.309000,2
+30.625000,2
 30.626000,1
+30.781000,2
+30.918000,2
 31.084000,1
 31.205000,0
+31.208000,2
+31.499000,2
 31.795000,1
+31.795000,2
 32.093000,0
+32.095000,2
 32.388000,0
+32.390000,2
+32.698000,2
 32.988000,1
+32.990000,2
+33.158000,2
+33.293000,2
 33.583000,0
+33.588000,2
+33.891000,2
 34.192000,1
+34.192000,2
+34.477000,2
+34.781000,2
 34.782000,0
+35.084000,2
+35.377000,2
 35.378000,1
+35.550000,2
+35.678000,2
 35.957000,0
+35.965000,2
+36.267000,2
+36.560000,2
 36.561000,1
+36.724000,2
+36.857000,2
 37.150000,0
+37.152000,2
+37.448000,2
 37.749000,1
+37.750000,2
+38.038000,2
 38.222000,0
 38.340000,0
+38.340000,2
 38.507000,1
 38.629000,0
+38.631000,2
 38.931000,1
+38.931000,2
+39.217000,2
 39.519000,0
+39.520000,2
+39.813000,2
+40.126000,2
 40.131000,1
 40.374000,0
+40.411000,2
 40.719000,0
+40.720000,2
+41.028000,2
 41.330000,1
+41.330000,2
+41.493000,2
+41.621000,2
 41.808000,1
 41.924000,0
+41.926000,2
 42.109000,1
+42.216000,2
 42.500000,1
+42.522000,2
+42.663000,2
+42.797000,2
 42.959000,1
 43.093000,0
+43.095000,2
 43.290000,1
+43.385000,2
 43.692000,1
+43.694000,2
+43.989000,2
 44.276000,0
+44.281000,2
 44.448000,1
+44.575000,2
 44.874000,1
+44.880000,2
+45.044000,2
+45.178000,2
 45.347000,1
 45.471000,0
+45.473000,2
+45.766000,2
+46.057000,2
 46.058000,1
+46.359000,2
 46.658000,0
+46.659000,2
 46.827000,1
+46.960000,2
+47.251000,2
 47.255000,1
+47.406000,2
+47.546000,2
 47.727000,1
 47.846000,0
+47.848000,2
 48.021000,1
 48.138000,0
+48.140000,2
 48.438000,1
+48.439000,2
+48.610000,2
+48.740000,2
diff --git a/dataset/eval/enst/drummer_2_140_MIDI-minus-one_grunge_sticks.csv b/dataset/eval/enst/drummer_2_140_MIDI-minus-one_grunge_sticks.csv
index 34705b28e4e9e2b9591a60feb8c5aec14ff5af6c..ece60bbba043c98d9f62391647028e9edba4bf82 100644
--- a/dataset/eval/enst/drummer_2_140_MIDI-minus-one_grunge_sticks.csv
+++ b/dataset/eval/enst/drummer_2_140_MIDI-minus-one_grunge_sticks.csv
@@ -1,6 +1,7 @@
 onset_time_s,class_5
 1.291000,1
 1.495000,0
+1.791000,2
 1.803000,0
 2.300000,1
 2.792000,0
@@ -33,6 +34,7 @@ onset_time_s,class_5
 12.801000,1
 13.031000,0
 13.274000,1
+13.274000,2
 13.295000,1
 13.523000,0
 13.780000,0
@@ -54,67 +56,134 @@ onset_time_s,class_5
 20.292000,1
 20.534000,0
 20.773000,1
+20.801000,3
 21.029000,0
+21.273000,2
 21.279000,1
+21.286000,3
 21.515000,0
 21.775000,0
 22.285000,1
+22.287000,2
 22.469000,0
+22.522000,2
 22.783000,0
+22.784000,2
 23.040000,0
 23.292000,1
+23.293000,2
 23.799000,0
+23.803000,2
 24.292000,1
+24.294000,2
 24.794000,0
+24.798000,2
 25.048000,0
 25.303000,1
+25.304000,2
 25.795000,0
+25.800000,2
 26.297000,1
+26.299000,2
 26.547000,0
 26.805000,0
+26.807000,2
 27.057000,0
 27.304000,1
+27.306000,2
 27.780000,0
+27.789000,2
 28.299000,1
+28.300000,2
 28.790000,0
+28.792000,2
+29.047000,2
 29.051000,0
 29.305000,1
+29.306000,2
 29.796000,0
 30.307000,1
+30.308000,2
+30.527000,2
 30.787000,0
+30.791000,2
+31.043000,2
 31.046000,0
 31.312000,1
+31.312000,2
+31.531000,2
 31.799000,0
+31.807000,2
 32.301000,1
+32.302000,2
+32.541000,2
 32.793000,0
+32.797000,2
 33.038000,0
 33.296000,1
+33.297000,2
+33.534000,2
 33.781000,0
+33.785000,2
+34.027000,2
 34.295000,1
+34.296000,2
+34.521000,2
 34.783000,0
+34.788000,2
+35.026000,2
 35.042000,0
 35.288000,1
+35.289000,2
+35.519000,2
+35.775000,2
 35.782000,0
 36.037000,1
+36.039000,2
+36.268000,2
+36.518000,2
 36.532000,0
 36.795000,1
+36.795000,2
+37.028000,2
 37.038000,0
 37.285000,1
 37.310000,1
 37.531000,0
 37.789000,0
+38.009000,2
 38.301000,1
+38.301000,2
 38.792000,0
+38.798000,2
+39.043000,2
 39.052000,0
 39.305000,1
+39.307000,2
+39.525000,2
 39.801000,0
+39.803000,2
 40.313000,1
+40.315000,2
+40.540000,2
 40.796000,0
+40.803000,2
+41.045000,2
 41.052000,0
 41.308000,1
+41.309000,2
+41.539000,2
 41.798000,0
+41.802000,2
+42.050000,2
 42.307000,1
+42.309000,2
+42.537000,2
 42.551000,0
 42.801000,0
+42.803000,2
 43.046000,0
+43.054000,2
 43.300000,1
+43.301000,2
+43.536000,2
diff --git a/dataset/eval/enst/drummer_2_142_MIDI-minus-one_nu-soul_sticks.csv b/dataset/eval/enst/drummer_2_142_MIDI-minus-one_nu-soul_sticks.csv
index 34f977fef101bdc2971ea04397471ea956ec921b..a7b9fbc51dbae9e33c17fc5427e31d48218d142c 100644
--- a/dataset/eval/enst/drummer_2_142_MIDI-minus-one_nu-soul_sticks.csv
+++ b/dataset/eval/enst/drummer_2_142_MIDI-minus-one_nu-soul_sticks.csv
@@ -1,16 +1,38 @@
 onset_time_s,class_5
+2.208000,2
+2.475000,2
 2.483000,0
+2.777000,2
 3.079000,1
+3.080000,2
+3.340000,2
+3.630000,2
+3.914000,2
 4.202000,1
+4.204000,2
+4.486000,2
+4.756000,2
 4.783000,0
+5.081000,2
 5.375000,1
+5.376000,2
+5.658000,2
 5.842000,1
+5.959000,2
 6.231000,0
+6.234000,2
 6.528000,1
+6.529000,2
 6.740000,0
+6.810000,2
 7.092000,0
+7.094000,2
 7.278000,1
+7.390000,2
+7.681000,2
 7.682000,1
+7.962000,2
+8.245000,2
 8.430000,1
 8.525000,1
 8.820000,0
@@ -19,13 +41,41 @@ onset_time_s,class_5
 9.108000,1
 9.270000,1
 9.389000,0
+9.663000,2
 9.973000,1
+9.982000,2
+10.266000,2
+10.553000,2
+10.846000,2
 11.120000,0
+11.128000,2
+11.438000,2
+11.727000,2
+12.010000,2
 12.309000,0
+12.310000,2
+12.610000,2
+12.902000,2
+13.186000,2
 13.463000,0
+13.464000,2
+13.758000,2
+14.035000,2
+14.318000,2
 14.596000,0
+14.598000,2
+14.894000,2
+15.185000,2
+15.466000,2
 15.752000,0
+15.754000,2
+16.046000,2
+16.332000,2
+16.611000,2
 16.903000,0
+16.906000,2
+17.206000,2
+17.502000,2
 17.670000,1
 17.777000,1
 18.067000,0
@@ -34,102 +84,193 @@ onset_time_s,class_5
 18.351000,1
 18.512000,1
 18.634000,0
+18.903000,2
+19.187000,2
 19.199000,1
 19.451000,0
+19.475000,2
 19.654000,1
 19.770000,0
+19.779000,2
+20.056000,2
 20.350000,1
+20.351000,2
+20.639000,2
 20.935000,0
+20.936000,2
+21.231000,2
 21.530000,1
+21.531000,2
+21.817000,2
 21.974000,1
 22.098000,0
+22.099000,2
+22.394000,2
 22.682000,1
+22.683000,2
+22.968000,2
 23.240000,0
+23.243000,2
+23.546000,2
 23.834000,1
+23.835000,2
+23.985000,2
+24.122000,2
 24.406000,0
+24.408000,2
+24.695000,2
 24.977000,1
+24.977000,2
+25.125000,2
+25.266000,2
 25.447000,1
 25.557000,0
+25.559000,2
+25.840000,2
+26.124000,2
 26.125000,1
 26.353000,0
+26.418000,2
 26.697000,0
+26.699000,2
 26.983000,0
+26.984000,2
 27.278000,1
+27.278000,2
 27.508000,0
+27.568000,2
 27.840000,0
+28.128000,2
 28.444000,1
+28.445000,2
 28.720000,0
+28.720000,2
 29.016000,0
+29.018000,2
+29.309000,2
 29.599000,1
+29.602000,2
+29.745000,2
+29.882000,2
 30.183000,0
+30.183000,2
+30.467000,2
 30.751000,1
+30.751000,2
 30.987000,0
+31.042000,2
 31.198000,1
 31.325000,0
+31.326000,2
+31.606000,2
 31.897000,1
+31.899000,2
+32.180000,2
 32.358000,1
 32.472000,0
+32.474000,2
+32.763000,2
+33.045000,2
 33.054000,1
 33.290000,0
+33.347000,2
 33.621000,0
+33.627000,2
+33.916000,2
 34.208000,1
+34.210000,2
 34.453000,0
+34.499000,2
 34.778000,0
+34.784000,2
+35.081000,2
 35.364000,1
+35.365000,2
 35.504000,1
 35.598000,0
+35.659000,2
 35.819000,1
 35.934000,0
+35.936000,2
 36.220000,0
+36.221000,2
 36.520000,1
+36.522000,2
 36.783000,0
+36.821000,2
 36.954000,1
 37.035000,1
 37.099000,0
+37.107000,2
 37.381000,0
+37.384000,2
 37.647000,0
 37.673000,1
+37.674000,2
 37.957000,0
+37.962000,2
 38.251000,0
+38.253000,2
 38.536000,0
+38.538000,2
 38.823000,1
+38.825000,2
 39.082000,0
+39.108000,2
 39.299000,1
 39.392000,0
+39.398000,2
 39.687000,0
+39.689000,2
 39.975000,1
+39.977000,2
 40.145000,1
 40.267000,1
 40.402000,1
 40.527000,0
 40.823000,0
+40.824000,2
 41.133000,1
 41.391000,0
 41.426000,1
 41.579000,1
 41.699000,0
+41.993000,2
+42.284000,2
 42.289000,1
 42.539000,0
+42.576000,2
 42.726000,1
 42.865000,0
+42.867000,2
 43.155000,0
+43.168000,2
 43.445000,1
+43.446000,2
 43.693000,0
+43.739000,2
 43.897000,1
 44.019000,0
+44.024000,2
+44.312000,2
 44.599000,1
+44.599000,2
 44.841000,0
+44.895000,2
 45.043000,1
 45.175000,0
+45.177000,2
 45.327000,1
 45.454000,1
 45.605000,1
 45.715000,0
+45.735000,2
 45.896000,1
 46.025000,1
 46.035000,0
 46.325000,0
 46.873000,0
+46.913000,2
 46.918000,1
 47.198000,0
 47.498000,0
diff --git a/dataset/eval/enst/drummer_2_144_MIDI-minus-one_rock-113_sticks.csv b/dataset/eval/enst/drummer_2_144_MIDI-minus-one_rock-113_sticks.csv
index 39f9bb20da60d4c3246778b9c7c96d935bb9f084..5d36adc2ca3ecb35e797b5012df79a1f4993c68a 100644
--- a/dataset/eval/enst/drummer_2_144_MIDI-minus-one_rock-113_sticks.csv
+++ b/dataset/eval/enst/drummer_2_144_MIDI-minus-one_rock-113_sticks.csv
@@ -1,6 +1,9 @@
 onset_time_s,class_5
 0.082000,0
+0.259000,3
 0.547000,0
+0.556000,3
+0.804000,3
 1.029000,1
 1.031000,0
 1.465000,0
@@ -34,59 +37,148 @@ onset_time_s,class_5
 19.335000,0
 19.382000,1
 19.641000,0
+19.904000,2
 20.196000,1
+20.197000,2
+20.468000,2
 20.729000,0
+20.731000,2
+21.009000,2
 21.286000,1
+21.287000,2
+21.558000,2
 21.815000,0
+21.816000,2
+22.084000,2
 22.353000,1
+22.354000,2
+22.607000,2
 22.863000,0
+22.864000,2
+23.132000,2
 23.394000,1
+23.395000,2
+23.643000,2
 23.914000,0
+23.916000,2
+24.183000,2
 24.449000,1
+24.450000,2
+24.717000,2
 24.987000,0
+24.988000,2
+25.257000,2
 25.532000,1
+25.533000,2
+25.791000,2
 26.050000,0
+26.052000,2
+26.319000,2
 26.592000,1
+26.593000,2
+26.855000,2
+27.120000,2
 27.121000,0
+27.380000,2
 27.650000,1
+27.652000,2
 27.914000,1
 27.918000,0
 28.037000,1
 28.180000,0
+28.444000,2
 28.720000,1
+28.721000,2
+28.972000,2
 29.231000,0
+29.233000,2
+29.477000,2
 29.760000,1
+29.761000,2
+30.032000,2
 30.291000,0
+30.293000,2
+30.563000,2
 30.822000,1
+30.823000,2
+31.096000,2
 31.345000,0
+31.346000,2
+31.614000,2
 31.886000,1
+31.887000,2
+32.148000,2
 32.407000,0
+32.410000,2
+32.673000,2
 32.950000,1
+32.951000,2
+33.212000,2
 33.476000,0
+33.476000,2
+33.738000,2
 34.015000,1
+34.015000,2
+34.275000,2
 34.534000,0
+34.536000,2
+34.800000,2
 35.066000,1
+35.067000,2
+35.335000,2
 35.593000,0
+35.601000,2
+35.862000,2
 36.142000,1
 36.270000,1
 36.385000,0
 36.394000,1
 36.659000,0
+36.916000,2
+37.174000,2
 37.187000,1
+37.450000,2
 37.712000,0
+37.719000,2
+37.975000,2
 38.251000,1
+38.252000,2
+38.507000,2
 38.771000,0
+38.773000,2
+39.032000,2
 39.307000,1
+39.310000,2
+39.569000,2
 39.840000,0
+39.841000,2
+40.100000,2
 40.374000,1
+40.375000,2
 40.632000,0
+40.637000,2
 40.905000,0
+40.907000,2
 41.059000,1
+41.168000,2
 41.433000,1
+41.436000,2
+41.705000,2
 41.973000,0
+41.974000,2
+42.242000,2
 42.507000,1
+42.508000,2
+42.776000,2
 43.038000,0
+43.040000,2
+43.299000,2
 43.577000,1
+43.578000,2
+43.836000,2
 43.838000,0
+44.109000,3
 44.114000,0
+44.365000,3
+44.631000,3
 44.874000,0
diff --git a/dataset/eval/enst/drummer_2_146_MIDI-minus-one_rock'n'roll-188_sticks.csv b/dataset/eval/enst/drummer_2_146_MIDI-minus-one_rock'n'roll-188_sticks.csv
index 255bd0fb13c959ec1f4d3c443d8df1c89e10cb21..088ae54d9f95cbfc55b48ee3ff5c7102b4084d08 100644
--- a/dataset/eval/enst/drummer_2_146_MIDI-minus-one_rock'n'roll-188_sticks.csv
+++ b/dataset/eval/enst/drummer_2_146_MIDI-minus-one_rock'n'roll-188_sticks.csv
@@ -2,14 +2,23 @@ onset_time_s,class_5
 0.227000,1
 0.371000,1
 0.682000,0
+0.684000,2
 1.024000,1
+1.025000,2
+1.359000,2
 1.687000,1
+1.688000,2
+1.852000,2
+2.026000,2
 2.345000,1
+2.347000,2
+2.650000,2
 2.807000,1
 2.942000,1
 3.103000,1
 3.239000,0
 3.570000,1
+3.570000,2
 3.755000,1
 3.891000,0
 4.221000,1
@@ -56,69 +65,119 @@ onset_time_s,class_5
 15.539000,1
 15.605000,1
 15.665000,1
+15.694000,2
 15.707000,1
 15.721000,0
+15.813000,2
+16.034000,2
 16.036000,0
 16.037000,1
+17.293000,2
 17.301000,1
 17.509000,1
+17.571000,2
 17.611000,1
 17.701000,1
 17.822000,1
+17.823000,2
 17.913000,1
 18.035000,1
 18.116000,1
+18.215000,2
 18.232000,1
 18.479000,1
 18.526000,0
 18.877000,1
+18.879000,2
 19.071000,1
 19.182000,0
+19.187000,2
 19.512000,1
+19.514000,2
 19.835000,0
+19.836000,2
 20.164000,1
+20.166000,2
 20.477000,0
+20.483000,2
 20.804000,1
+20.805000,2
 21.122000,0
+21.127000,2
 21.444000,1
+21.446000,2
 21.715000,1
 21.771000,0
+21.775000,2
 22.089000,1
+22.092000,2
+22.313000,2
 22.405000,0
+22.411000,2
+22.719000,2
 22.720000,1
 22.932000,1
 23.030000,0
+23.030000,2
 23.342000,1
+23.343000,2
+23.663000,2
 23.669000,0
 23.988000,1
+23.990000,2
+24.306000,2
 24.307000,0
 24.628000,1
+24.630000,2
 24.812000,1
 24.945000,0
+24.947000,2
 25.260000,1
+25.263000,2
 25.581000,0
+25.583000,2
 25.899000,1
+25.900000,2
 26.110000,1
 26.222000,0
+26.227000,2
 26.548000,1
+26.549000,2
 26.866000,0
+26.868000,2
 27.181000,1
+27.181000,2
 27.367000,1
+27.404000,2
 27.506000,0
+27.507000,2
+27.813000,2
 27.818000,1
 28.000000,1
 28.137000,0
+28.139000,2
+28.448000,2
 28.449000,1
+28.658000,2
 28.765000,0
+28.774000,2
 29.081000,1
+29.084000,2
 29.265000,1
+29.412000,2
 29.414000,0
 29.731000,1
+29.732000,2
 29.924000,1
 30.057000,0
+30.061000,2
 30.387000,1
+30.391000,2
+30.708000,2
 30.709000,0
 31.026000,1
+31.026000,2
+31.337000,2
 31.343000,0
 31.343000,1
 31.459000,1
@@ -127,11 +186,13 @@ onset_time_s,class_5
 31.642000,1
 31.842000,1
 31.938000,0
+31.939000,2
 32.066000,1
 32.152000,1
 32.244000,0
 32.249000,1
 32.456000,1
+32.565000,2
 32.569000,0
 32.683000,1
 32.780000,1
@@ -146,6 +207,7 @@ onset_time_s,class_5
 33.503000,1
 33.715000,1
 33.814000,0
+34.129000,2
 34.141000,0
 34.144000,1
 34.327000,1
diff --git a/dataset/eval/enst/drummer_2_148_MIDI-minus-one_soul-120-marvin-gaye_sticks.csv b/dataset/eval/enst/drummer_2_148_MIDI-minus-one_soul-120-marvin-gaye_sticks.csv
index fd73a6edad4290868309dc7d8aa7626131e7eb31..148c85ae64b9e281cb3ebef9f3d40250df2960b0 100644
--- a/dataset/eval/enst/drummer_2_148_MIDI-minus-one_soul-120-marvin-gaye_sticks.csv
+++ b/dataset/eval/enst/drummer_2_148_MIDI-minus-one_soul-120-marvin-gaye_sticks.csv
@@ -1,89 +1,196 @@
 onset_time_s,class_5
+0.256000,2
+0.752000,2
+1.274000,2
+1.766000,2
+2.242000,2
+2.733000,2
+3.240000,2
+3.740000,2
+4.245000,2
+4.736000,2
 4.746000,1
+5.259000,2
 5.519000,0
+5.762000,2
 5.765000,1
 5.977000,0
 6.246000,0
+6.247000,2
 6.746000,1
+6.748000,2
+7.244000,2
 7.490000,0
 7.736000,1
+7.738000,2
 8.243000,0
+8.246000,2
+8.749000,2
 8.755000,1
+9.002000,2
+9.269000,2
 9.500000,0
 9.757000,1
+9.759000,2
 9.994000,0
+9.995000,2
 10.253000,0
+10.255000,2
+10.739000,2
 10.742000,1
+11.223000,2
 11.230000,0
 11.484000,0
+11.726000,2
 11.731000,1
+12.240000,2
 12.491000,0
 12.742000,1
+12.743000,2
+12.983000,2
 13.247000,0
+13.249000,2
 13.493000,0
 13.748000,1
+13.748000,2
 13.959000,0
+13.993000,2
 14.249000,0
+14.250000,2
+14.490000,2
+14.755000,2
 14.761000,1
 14.971000,0
+15.015000,2
 15.252000,0
+15.259000,2
 15.504000,0
+15.745000,2
 15.749000,1
 15.977000,0
+16.006000,2
+16.246000,2
 16.258000,0
+16.742000,2
 16.744000,1
+16.997000,2
+17.262000,2
 17.508000,0
 17.751000,1
+17.751000,2
+17.991000,2
+18.241000,2
 18.248000,0
+18.742000,2
 18.747000,1
+19.000000,2
 19.247000,0
+19.249000,2
 19.492000,0
+19.747000,2
 19.752000,1
+19.993000,2
+20.260000,2
 20.261000,0
 20.500000,1
+20.738000,2
 20.988000,0
 21.247000,1
 21.276000,1
 21.496000,0
 21.734000,1
+21.734000,2
+21.760000,3
 21.991000,0
 22.248000,0
 22.764000,1
+22.764000,2
 22.957000,0
 23.248000,0
+23.250000,2
 23.510000,0
 23.754000,1
+23.754000,2
+23.995000,2
 24.254000,0
+24.256000,2
 24.738000,1
+24.740000,2
+24.988000,2
 24.991000,0
 25.245000,0
+25.247000,2
+25.489000,2
 25.750000,1
+25.751000,2
+25.990000,2
 26.265000,0
+26.265000,2
+26.511000,2
+26.761000,2
 26.768000,1
+27.012000,2
 27.259000,0
+27.266000,2
+27.496000,2
 27.754000,1
+27.756000,2
+28.247000,2
+28.493000,2
 28.495000,0
 28.762000,1
+28.763000,2
+28.998000,2
 29.251000,0
+29.253000,2
 29.503000,0
 29.754000,1
+29.756000,2
+30.008000,2
+30.250000,2
 30.252000,0
 30.750000,1
+30.752000,2
+30.993000,2
 31.244000,0
+31.245000,2
 31.494000,0
 31.744000,1
+31.744000,2
+31.999000,2
 32.248000,0
+32.251000,2
+32.746000,2
 32.757000,1
+33.004000,2
+33.251000,2
+33.513000,2
 33.518000,0
 33.760000,1
+33.761000,2
+33.993000,2
 34.264000,0
+34.268000,2
+34.510000,2
 34.765000,1
+34.765000,2
+34.995000,2
+35.257000,2
 35.259000,0
 35.512000,0
 35.753000,1
+35.753000,2
+36.008000,2
 36.246000,0
+36.248000,2
+36.480000,2
+36.745000,2
 36.751000,1
+36.993000,2
+37.263000,2
 37.266000,0
+37.515000,3
+37.759000,2
 37.767000,1
 38.008000,0
 38.265000,0
@@ -106,6 +213,9 @@ onset_time_s,class_5
 45.262000,0
 45.501000,1
 45.759000,1
+45.759000,2
 46.261000,0
 46.773000,1
+46.774000,2
 47.243000,0
+47.245000,2
diff --git a/dataset/eval/enst/drummer_2_150_MIDI-minus-one_soul-98_sticks.csv b/dataset/eval/enst/drummer_2_150_MIDI-minus-one_soul-98_sticks.csv
index 9be4703c9db9e2591ee33d97e1ed70e34f687a28..aca76172c857710eefe32158316741bfc434d547 100644
--- a/dataset/eval/enst/drummer_2_150_MIDI-minus-one_soul-98_sticks.csv
+++ b/dataset/eval/enst/drummer_2_150_MIDI-minus-one_soul-98_sticks.csv
@@ -1,6 +1,12 @@
 onset_time_s,class_5
+2.101000,2
 2.656000,0
+2.656000,2
+2.979000,2
+3.296000,2
 3.302000,1
+3.618000,2
+3.905000,2
 4.541000,0
 5.758000,0
 6.967000,0
@@ -15,55 +21,155 @@ onset_time_s,class_5
 15.543000,0
 16.752000,0
 17.960000,0
+19.175000,2
 19.184000,1
 19.456000,0
+19.507000,2
+19.794000,2
 19.798000,0
+20.101000,2
+20.384000,2
+20.668000,2
 20.830000,0
+20.990000,2
 20.993000,0
+21.317000,2
+21.628000,2
+21.934000,2
 22.242000,0
+22.244000,2
+22.556000,2
+22.857000,2
+23.157000,2
 23.457000,0
+23.459000,2
+23.759000,2
+24.074000,2
+24.381000,2
+24.540000,2
 24.691000,0
+24.693000,2
+25.001000,2
+25.304000,2
+25.604000,2
+25.907000,2
 25.909000,0
+26.215000,2
+26.536000,2
+26.843000,2
 27.137000,0
+27.138000,2
+27.443000,2
+27.756000,2
+28.058000,2
 28.230000,0
 28.367000,0
+28.371000,2
+28.691000,2
+29.008000,2
+29.300000,2
 29.585000,0
+29.901000,2
+30.213000,2
+30.508000,2
+30.667000,2
 30.818000,0
+30.820000,2
+31.118000,2
+31.428000,2
+31.738000,2
 32.023000,0
+32.025000,2
+32.338000,2
+32.642000,2
+32.943000,2
+33.105000,2
+33.250000,2
 33.253000,0
+33.572000,2
+33.884000,2
+34.191000,2
+34.339000,2
 34.493000,0
+34.496000,2
+34.793000,2
+35.094000,2
+35.392000,2
 35.702000,0
+35.704000,2
+35.999000,2
+36.318000,2
+36.617000,2
 36.917000,0
+36.918000,2
+37.224000,2
+37.539000,2
+37.839000,2
 38.006000,0
 38.167000,0
+38.168000,2
+38.460000,2
 38.474000,0
 38.790000,1
 39.049000,0
+39.086000,2
 39.404000,0
+39.406000,2
+39.707000,2
+40.021000,2
 40.022000,1
 40.272000,0
+40.318000,2
 40.618000,0
+40.633000,2
+40.928000,2
 41.245000,1
+41.247000,2
+41.545000,2
 41.844000,0
+41.851000,2
+42.164000,2
 42.478000,1
+42.479000,2
+42.781000,2
 43.081000,0
+43.082000,2
+43.383000,2
 43.692000,1
+43.693000,2
+43.996000,2
+44.294000,2
 44.308000,0
+44.611000,2
 44.911000,1
+44.913000,2
 45.149000,0
+45.214000,2
 45.518000,0
+45.521000,2
+45.810000,2
 45.977000,1
+46.085000,2
 46.131000,1
 46.436000,0
+46.440000,3
 46.611000,1
+46.726000,2
 46.754000,0
 47.067000,1
 47.228000,0
 47.671000,0
+48.254000,2
 48.561000,1
 48.590000,1
 48.802000,0
 49.168000,0
 49.787000,1
+49.787000,2
+50.088000,2
 50.382000,0
+50.396000,2
+50.694000,2
 51.018000,1
+51.019000,2
+51.330000,2
diff --git a/dataset/eval/enst/drummer_2_152_MIDI-minus-one_fusion-125_sticks.csv b/dataset/eval/enst/drummer_2_152_MIDI-minus-one_fusion-125_sticks.csv
index 2bba7f15b3b6deb4a8d9e141c63190d98048e554..a9609524f29b1b93c97118a41390d883d59321d5 100644
--- a/dataset/eval/enst/drummer_2_152_MIDI-minus-one_fusion-125_sticks.csv
+++ b/dataset/eval/enst/drummer_2_152_MIDI-minus-one_fusion-125_sticks.csv
@@ -1,128 +1,224 @@
 onset_time_s,class_5
 4.277000,0
+4.279000,2
 4.814000,1
+4.815000,2
 5.283000,0
+5.285000,2
 5.773000,1
+5.775000,2
 6.162000,1
 6.263000,0
+6.268000,2
 6.766000,1
+6.767000,2
+7.271000,2
 7.272000,0
 7.422000,1
 7.686000,0
 7.803000,1
+7.804000,2
 8.047000,0
 8.310000,0
 8.819000,1
+8.821000,2
 9.318000,0
+9.320000,2
 9.820000,1
+9.821000,2
 10.179000,1
 10.300000,0
+10.305000,2
 10.794000,1
+10.795000,2
 11.160000,1
 11.276000,0
+11.280000,2
 11.382000,1
 11.631000,0
 11.758000,1
+11.759000,2
 11.869000,1
+12.089000,2
 12.106000,1
 12.205000,0
+12.211000,2
 12.701000,1
+12.702000,2
 13.059000,1
 13.167000,0
+13.170000,2
 13.279000,1
+13.401000,2
 13.522000,0
 13.646000,1
+13.647000,2
+13.877000,2
 13.966000,1
+14.086000,2
 14.094000,0
 14.225000,1
 14.589000,1
+14.590000,2
+14.829000,2
 14.942000,1
 15.050000,0
+15.054000,2
 15.172000,1
+15.282000,2
 15.415000,0
 15.537000,1
+15.538000,2
 15.879000,1
 15.991000,0
 16.485000,1
+16.485000,2
 16.843000,1
 16.962000,0
+16.964000,2
 17.076000,1
+17.203000,2
 17.340000,0
 17.464000,1
+17.465000,2
 17.647000,0
+17.697000,2
 17.824000,1
 17.934000,0
+17.939000,2
 18.061000,1
 18.425000,1
+18.426000,2
 18.796000,1
 18.896000,0
+18.906000,2
 19.002000,1
+19.131000,2
 19.262000,0
 19.381000,1
+19.382000,2
 19.495000,1
 19.508000,0
+19.618000,2
 19.753000,1
 19.853000,0
 20.010000,1
+20.129000,2
 20.242000,0
 20.360000,1
+20.361000,2
+20.599000,2
 20.723000,1
 20.832000,0
+20.837000,2
 20.947000,1
+21.064000,2
 21.192000,0
 21.317000,1
+21.318000,2
+21.522000,2
 21.660000,1
 21.768000,0
+21.774000,2
 21.901000,1
+22.010000,2
 22.134000,0
 22.262000,1
+22.263000,2
+22.486000,2
 22.723000,0
 22.726000,1
+22.730000,2
+22.974000,2
 23.091000,0
 23.229000,1
+23.229000,2
+23.450000,2
 23.700000,0
 24.771000,1
+24.771000,2
+25.117000,2
+25.437000,2
+25.792000,2
 25.803000,0
+26.149000,2
 26.486000,1
+26.487000,2
 26.821000,0
+26.828000,2
 27.169000,1
+27.170000,2
 27.481000,0
+27.490000,2
 27.686000,1
 27.827000,0
+28.212000,2
+28.552000,2
 28.561000,0
 28.800000,0
 28.914000,1
+28.915000,2
+29.255000,2
 29.508000,1
+29.653000,2
 30.045000,0
+30.050000,2
 30.464000,0
+30.466000,2
 30.821000,0
 31.226000,1
+31.227000,2
+31.622000,2
 31.854000,1
+32.002000,2
 34.602000,1
+34.602000,2
 35.317000,0
+35.681000,2
 35.691000,0
 36.060000,1
+36.061000,2
+36.425000,2
 36.592000,1
+36.782000,2
 36.785000,0
+36.940000,2
 37.149000,0
+37.153000,2
+37.271000,2
 37.531000,1
+37.532000,2
+37.869000,2
 38.078000,1
 38.179000,1
 38.246000,0
+38.250000,2
+38.612000,2
 38.621000,0
 38.987000,1
+38.989000,2
+39.334000,2
 39.532000,0
 39.708000,0
+39.711000,2
+40.075000,2
 40.090000,0
 40.271000,0
 40.461000,1
+40.462000,2
+40.795000,2
 41.024000,1
 41.172000,0
+41.549000,2
 41.550000,0
 41.909000,1
+41.909000,2
+42.264000,2
 42.432000,1
 42.533000,1
 42.621000,0
+42.627000,2
+42.989000,2
 43.195000,1
 43.291000,1
 43.385000,0
@@ -133,54 +229,99 @@ onset_time_s,class_5
 43.919000,1
 44.088000,0
 44.371000,1
+44.452000,2
 44.464000,0
 44.840000,1
+44.841000,2
+45.200000,2
 45.383000,0
 45.562000,0
+45.566000,2
 45.936000,0
+45.942000,2
 46.302000,1
+46.303000,2
+46.677000,2
 46.849000,1
 46.964000,1
 47.034000,0
+47.039000,2
 47.398000,0
+47.404000,2
 47.786000,1
+47.786000,2
+48.147000,2
 48.512000,0
+48.515000,2
+48.870000,2
 49.086000,1
 49.251000,1
 49.253000,0
+49.428000,3
+49.602000,3
 49.606000,0
 49.944000,0
+50.303000,2
 50.693000,1
+50.695000,2
+51.049000,2
+51.403000,2
 51.408000,0
 51.772000,0
+51.780000,2
 52.163000,1
+52.164000,2
+52.529000,2
 52.699000,1
 52.720000,0
+52.885000,2
 52.887000,0
+53.248000,2
 53.253000,0
 53.438000,0
 53.628000,1
+53.628000,2
+53.982000,2
 54.151000,1
 54.338000,0
+54.340000,2
 54.519000,1
+54.687000,2
 54.705000,0
 54.896000,0
 55.068000,1
+55.068000,2
 55.299000,1
+55.436000,2
 55.625000,1
 55.798000,0
+56.166000,2
 56.554000,1
+56.556000,2
+56.899000,2
+57.078000,2
 57.089000,0
 57.260000,0
+57.262000,2
 57.464000,1
 57.640000,0
+57.640000,2
 58.009000,1
+58.010000,2
+58.368000,2
 58.570000,1
+58.744000,2
 58.745000,0
 59.125000,0
+59.127000,2
 59.503000,1
+59.504000,2
+59.858000,2
 60.047000,1
 60.209000,0
+60.216000,2
+60.572000,2
+60.938000,2
 61.145000,1
 61.313000,0
 61.314000,1
@@ -188,9 +329,16 @@ onset_time_s,class_5
 61.648000,0
 61.858000,1
 62.005000,0
+62.006000,2
 62.374000,1
+62.375000,2
+62.721000,2
 62.896000,0
 63.074000,0
+63.076000,2
 63.460000,0
+63.464000,2
 63.858000,1
+63.859000,2
+64.227000,2
 64.426000,0
diff --git a/dataset/eval/enst/drummer_3_002_hits_medium-tom-1_sticks_x5.csv b/dataset/eval/enst/drummer_3_002_hits_medium-tom-1_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..4fa4be2220da16b8fca542c4cb49b42bc3f065e0
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_002_hits_medium-tom-1_sticks_x5.csv
@@ -0,0 +1,6 @@
+onset_time_s,class_5
+0.390000,3
+2.920000,3
+5.692000,3
+8.572000,3
+11.252000,3
diff --git a/dataset/eval/enst/drummer_3_003_hits_medium-tom-2_sticks_x5.csv b/dataset/eval/enst/drummer_3_003_hits_medium-tom-2_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_003_hits_medium-tom-2_sticks_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_004_hits_low-tom-1_sticks_x5.csv b/dataset/eval/enst/drummer_3_004_hits_low-tom-1_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..4ecb272a4a11f91b5c97266530672980c75cc7cd
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_004_hits_low-tom-1_sticks_x5.csv
@@ -0,0 +1,6 @@
+onset_time_s,class_5
+0.381000,3
+3.280000,3
+6.980000,3
+10.867000,3
+14.596000,3
diff --git a/dataset/eval/enst/drummer_3_005_hits_low-tom-2_sticks_x5.csv b/dataset/eval/enst/drummer_3_005_hits_low-tom-2_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_005_hits_low-tom-2_sticks_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_007_hits_closed-hi-hat_sticks_x5.csv b/dataset/eval/enst/drummer_3_007_hits_closed-hi-hat_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..62ebccfa5dc9b0da0a566bcc26d5d4e4bf00a85e
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_007_hits_closed-hi-hat_sticks_x5.csv
@@ -0,0 +1,6 @@
+onset_time_s,class_5
+0.259000,2
+2.544000,2
+4.822000,2
+7.306000,2
+9.748000,2
diff --git a/dataset/eval/enst/drummer_3_008_hits_half-opened-hi-hat_sticks_x5.csv b/dataset/eval/enst/drummer_3_008_hits_half-opened-hi-hat_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..cfcc37c84360c30b0391176cac9177e08569e891
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_008_hits_half-opened-hi-hat_sticks_x5.csv
@@ -0,0 +1,6 @@
+onset_time_s,class_5
+0.299000,2
+2.647000,2
+5.269000,2
+7.847000,2
+10.414000,2
diff --git a/dataset/eval/enst/drummer_3_009_hits_open-hi-hat_sticks_x5.csv b/dataset/eval/enst/drummer_3_009_hits_open-hi-hat_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..99519b7cded78cd82716d7d3877b4c5ed3adfc54
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_009_hits_open-hi-hat_sticks_x5.csv
@@ -0,0 +1,6 @@
+onset_time_s,class_5
+0.205000,2
+3.526000,2
+7.772000,2
+12.580000,2
+17.683000,2
diff --git a/dataset/eval/enst/drummer_3_010_hits_wide-opened-hi-hat_sticks_x5.csv b/dataset/eval/enst/drummer_3_010_hits_wide-opened-hi-hat_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..5155a86b871b00a06460d1a7c1c6372f48601d69
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_010_hits_wide-opened-hi-hat_sticks_x5.csv
@@ -0,0 +1,6 @@
+onset_time_s,class_5
+0.141000,2
+7.389000,2
+13.122000,2
+18.256000,2
+24.231000,2
diff --git a/dataset/eval/enst/drummer_3_011_hits_pedal-hi-hat-closing_pedal_x5.csv b/dataset/eval/enst/drummer_3_011_hits_pedal-hi-hat-closing_pedal_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..d5b92060ed9a374104d262b67ceeb74e6c7e4f6d
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_011_hits_pedal-hi-hat-closing_pedal_x5.csv
@@ -0,0 +1,11 @@
+onset_time_s,class_5
+0.173000,2
+0.800000,2
+2.813000,2
+3.573000,2
+5.394000,2
+6.129000,2
+8.212000,2
+8.856000,2
+10.938000,2
+11.575000,2
diff --git a/dataset/eval/enst/drummer_3_012_hits_pedal-hi-hat_pedal_x1.csv b/dataset/eval/enst/drummer_3_012_hits_pedal-hi-hat_pedal_x1.csv
new file mode 100644
index 0000000000000000000000000000000000000000..22cfac349bc64f908f508a1799d77e8ea4d0cbe1
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_012_hits_pedal-hi-hat_pedal_x1.csv
@@ -0,0 +1,6 @@
+onset_time_s,class_5
+0.160000,2
+2.488000,2
+5.172000,2
+8.033000,2
+10.588000,2
diff --git a/dataset/eval/enst/drummer_3_013_hits_ride-cymbal-1_sticks_x5.csv b/dataset/eval/enst/drummer_3_013_hits_ride-cymbal-1_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_013_hits_ride-cymbal-1_sticks_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_014_hits_ride-cymbal-1-dome_sticks_x5.csv b/dataset/eval/enst/drummer_3_014_hits_ride-cymbal-1-dome_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_014_hits_ride-cymbal-1-dome_sticks_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_015_hits_ride-cymbal-2_sticks_x5.csv b/dataset/eval/enst/drummer_3_015_hits_ride-cymbal-2_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_015_hits_ride-cymbal-2_sticks_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_016_hits_ride-cymbal-played-as-crash_sticks_x5.csv b/dataset/eval/enst/drummer_3_016_hits_ride-cymbal-played-as-crash_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_016_hits_ride-cymbal-played-as-crash_sticks_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_017_hits_crash-cymbal-1_sticks_x5.csv b/dataset/eval/enst/drummer_3_017_hits_crash-cymbal-1_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_017_hits_crash-cymbal-1_sticks_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_018_hits_crash-cymbal-2_sticks_x5.csv b/dataset/eval/enst/drummer_3_018_hits_crash-cymbal-2_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_018_hits_crash-cymbal-2_sticks_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_019_hits_chinese-ride-cymbal_sticks_x5.csv b/dataset/eval/enst/drummer_3_019_hits_chinese-ride-cymbal_sticks_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_019_hits_chinese-ride-cymbal_sticks_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_022_hits_medium-tom-1_brushes_x5.csv b/dataset/eval/enst/drummer_3_022_hits_medium-tom-1_brushes_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..51fc9c1a50a7ffc089f29af6f9afa1bd978e4c2e
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_022_hits_medium-tom-1_brushes_x5.csv
@@ -0,0 +1,6 @@
+onset_time_s,class_5
+0.335000,3
+2.844000,3
+5.754000,3
+8.424000,3
+11.216000,3
diff --git a/dataset/eval/enst/drummer_3_023_hits_medium-tom-2_brushes_x5.csv b/dataset/eval/enst/drummer_3_023_hits_medium-tom-2_brushes_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_023_hits_medium-tom-2_brushes_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_024_hits_low-tom-1_brushes_x5.csv b/dataset/eval/enst/drummer_3_024_hits_low-tom-1_brushes_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..6a77c65d02d6ed6205267788673ad6c05ab1dea7
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_024_hits_low-tom-1_brushes_x5.csv
@@ -0,0 +1,6 @@
+onset_time_s,class_5
+0.233000,3
+3.368000,3
+6.853000,3
+10.567000,3
+14.763000,3
diff --git a/dataset/eval/enst/drummer_3_025_hits_low-tom-2_brushes_x5.csv b/dataset/eval/enst/drummer_3_025_hits_low-tom-2_brushes_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_025_hits_low-tom-2_brushes_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_026_hits_ride-cymbal-1_brushes_x5.csv b/dataset/eval/enst/drummer_3_026_hits_ride-cymbal-1_brushes_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_026_hits_ride-cymbal-1_brushes_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_027_hits_ride-cymbal-1-dome_brushes_x5.csv b/dataset/eval/enst/drummer_3_027_hits_ride-cymbal-1-dome_brushes_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_027_hits_ride-cymbal-1-dome_brushes_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_028_hits_ride-cymbal-1-brush-back_brushes_x2.csv b/dataset/eval/enst/drummer_3_028_hits_ride-cymbal-1-brush-back_brushes_x2.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_028_hits_ride-cymbal-1-brush-back_brushes_x2.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_029_hits_ride-cymbal-2_brushes_x5.csv b/dataset/eval/enst/drummer_3_029_hits_ride-cymbal-2_brushes_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_029_hits_ride-cymbal-2_brushes_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_030_hits_crash-cymbal-1_brushes_x5.csv b/dataset/eval/enst/drummer_3_030_hits_crash-cymbal-1_brushes_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_030_hits_crash-cymbal-1_brushes_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_031_hits_pedal-hi-hat-closing_brushes_x6.csv b/dataset/eval/enst/drummer_3_031_hits_pedal-hi-hat-closing_brushes_x6.csv
new file mode 100644
index 0000000000000000000000000000000000000000..b8be33459598525c7361b446bbd981d0acf8bbc3
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_031_hits_pedal-hi-hat-closing_brushes_x6.csv
@@ -0,0 +1,13 @@
+onset_time_s,class_5
+0.221000,2
+1.827000,2
+5.763000,2
+6.793000,2
+8.781000,2
+9.980000,2
+12.196000,2
+13.231000,2
+15.752000,2
+16.563000,2
+18.635000,2
+19.268000,2
diff --git a/dataset/eval/enst/drummer_3_032_hits_closed-hi-hat_brushes_x5.csv b/dataset/eval/enst/drummer_3_032_hits_closed-hi-hat_brushes_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..bd95c390998840462f42cb9671fb3af90d838022
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_032_hits_closed-hi-hat_brushes_x5.csv
@@ -0,0 +1,6 @@
+onset_time_s,class_5
+0.137000,2
+2.075000,2
+4.000000,2
+6.007000,2
+8.022000,2
diff --git a/dataset/eval/enst/drummer_3_033_hits_half-opened-hi-hat_brushes_x5.csv b/dataset/eval/enst/drummer_3_033_hits_half-opened-hi-hat_brushes_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..0b2ae0fd439ea9b98aeb8f3c6be87be8f7890ea1
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_033_hits_half-opened-hi-hat_brushes_x5.csv
@@ -0,0 +1,6 @@
+onset_time_s,class_5
+0.155000,2
+4.595000,2
+8.816000,2
+13.071000,2
+17.099000,2
diff --git a/dataset/eval/enst/drummer_3_034_hits_open-hi-hat_brushes_x5.csv b/dataset/eval/enst/drummer_3_034_hits_open-hi-hat_brushes_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..1530c9606b8acc2c3b94e7ed3589dafeda2160ed
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_034_hits_open-hi-hat_brushes_x5.csv
@@ -0,0 +1,6 @@
+onset_time_s,class_5
+0.242000,2
+4.952000,2
+10.164000,2
+15.491000,2
+19.974000,2
diff --git a/dataset/eval/enst/drummer_3_036_hits_medium-tom-1_rods_x5.csv b/dataset/eval/enst/drummer_3_036_hits_medium-tom-1_rods_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..247477ebd03eaf3b4a293eca4c2f23827e9985fb
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_036_hits_medium-tom-1_rods_x5.csv
@@ -0,0 +1,6 @@
+onset_time_s,class_5
+0.109000,3
+2.223000,3
+4.446000,3
+6.619000,3
+8.687000,3
diff --git a/dataset/eval/enst/drummer_3_037_hits_medium-tom-2_rods_x5.csv b/dataset/eval/enst/drummer_3_037_hits_medium-tom-2_rods_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ed0aea6df0b0ad192edb7567c3f5f5b99bccb150
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_037_hits_medium-tom-2_rods_x5.csv
@@ -0,0 +1 @@
+onset_time_s,class_5
diff --git a/dataset/eval/enst/drummer_3_038_hits_low-tom-1_rods_x5.csv b/dataset/eval/enst/drummer_3_038_hits_low-tom-1_rods_x5.csv
new file mode 100644
index 0000000000000000000000000000000000000000..4d1cfbb42de9a0349dd7064638253bbb4060df23
--- /dev/null
+++ b/dataset/eval/enst/drummer_3_038_hits_low-tom-1_rods_x5.csv
@@ -0,0 +1,6 @@
+onset_time_s,class_5
+0.123000,3
+2.316000,3
+4.375000,3
+6.681000,3
+8.965000,3