diff --git a/MEMO.md b/MEMO.md
new file mode 100644
index 00000000..f4bc760a
--- /dev/null
+++ b/MEMO.md
@@ -0,0 +1,8 @@
+socio proviamo a definire per semplicità i 3 modi di indagine del tool così è più facile anche per noi
+ 
+1) SMP      
+ 
+2) ET       (indagine per Events e Team, quella che abbiamo fatto per Lanus e Sarsfield)
+ 
+3) PP
+ 
\ No newline at end of file
diff --git a/app/Filament/Widgets/Boxes/ExpectationsBox3.php b/app/Filament/Widgets/Boxes/ExpectationsBox3.php
index 43ac748d..96507fe2 100644
--- a/app/Filament/Widgets/Boxes/ExpectationsBox3.php
+++ b/app/Filament/Widgets/Boxes/ExpectationsBox3.php
@@ -21,165 +21,201 @@ class ExpectationsBox3
             return [];
         }
 
-        // $sum = self::summen($res);
+        if ($spm == 'league' or $spm == 'all') {
+            $events = $res->count();
+            $tmp = [];
+            foreach ($bets as $bet) {
+                $tmp[$bet]['home'] = 0;
+                $tmp[$bet]['away'] = 0;
+            }
+            foreach ($res as $val) {
+                // GLS
+                $tmp['gls']['home'] += $val->gls_h;
+                $tmp['gls']['away'] += $val->gls_a;
+                // CRN
+                $tmp['crn']['home'] += $val->crn_h;
+                $tmp['crn']['away'] += $val->crn_a;
+                // FLS
+                $tmp['fls']['home'] += $val->fls_h;
+                $tmp['fls']['away'] += $val->fls_a;
+                // OFS
+                $tmp['ofs']['home'] += $val->ofs_h;
+                $tmp['ofs']['away'] += $val->ofs_a;
+                // CRD
+                $tmp['crd']['home'] += $val->crd_h;
+                $tmp['crd']['away'] += $val->crd_a;
+                // SNT
+                $tmp['snt']['home'] += $val->snt_h;
+                $tmp['snt']['away'] += $val->snt_a;
+                // TSH
+                $tmp['tsh']['home'] += $val->tsh_h;
+                $tmp['tsh']['away'] += $val->tsh_a;
+            }
+            foreach ($bets as $bet) {
+                $expectations[$bet]['home'] = round($tmp[$bet]['home'] / $events, 1);
+                $expectations[$bet]['away'] = round($tmp[$bet]['away'] / $events, 1);
+            }
+        } else {
+            $tmp = self::sceleton();
 
-        $tmp = self::sceleton();
-        foreach ($res as $val) {
-            //  home home
-            if ($match->home_id == $val->home_id) {
-                // GLS
-                $tmp['gls']['home']['events']['home']++;
-                $tmp['gls']['home']['scored']['home'] += $val->gls_h;
-                $tmp['gls']['home']['conceded']['home'] += $val->gls_a;
-                // CRN
-                $tmp['crn']['home']['events']['home']++;
-                $tmp['crn']['home']['scored']['home'] += $val->crn_h;
-                $tmp['crn']['home']['conceded']['home'] += $val->crn_a;
-                // FLS
-                $tmp['fls']['home']['events']['home']++;
-                $tmp['fls']['home']['scored']['home'] += $val->fls_h;
-                $tmp['fls']['home']['conceded']['home'] += $val->fls_a;
-                // OFS
-                $tmp['ofs']['home']['events']['home']++;
-                $tmp['ofs']['home']['scored']['home'] += $val->ofs_h;
-                $tmp['ofs']['home']['conceded']['home'] += $val->ofs_a;
-                // CRD
-                $tmp['crd']['home']['events']['home']++;
-                $tmp['crd']['home']['scored']['home'] += $val->crd_h;
-                $tmp['crd']['home']['conceded']['home'] += $val->crd_a;
-                // SNT
-                $tmp['snt']['home']['events']['home']++;
-                $tmp['snt']['home']['scored']['home'] += $val->snt_h;
-                $tmp['snt']['home']['conceded']['home'] += $val->snt_a;
-                // TSH
-                $tmp['tsh']['home']['events']['home']++;
-                $tmp['tsh']['home']['scored']['home'] += $val->tsh_h;
-                $tmp['tsh']['home']['conceded']['home'] += $val->tsh_a;
+            foreach ($res as $val) {
+                //  home home
+                if ($match->home_id == $val->home_id) {
+                    // GLS
+                    $tmp['gls']['home']['events']['home']++;
+                    $tmp['gls']['home']['scored']['home'] += $val->gls_h;
+                    $tmp['gls']['home']['conceded']['home'] += $val->gls_a;
+                    // CRN
+                    $tmp['crn']['home']['events']['home']++;
+                    $tmp['crn']['home']['scored']['home'] += $val->crn_h;
+                    $tmp['crn']['home']['conceded']['home'] += $val->crn_a;
+                    // FLS
+                    $tmp['fls']['home']['events']['home']++;
+                    $tmp['fls']['home']['scored']['home'] += $val->fls_h;
+                    $tmp['fls']['home']['conceded']['home'] += $val->fls_a;
+                    // OFS
+                    $tmp['ofs']['home']['events']['home']++;
+                    $tmp['ofs']['home']['scored']['home'] += $val->ofs_h;
+                    $tmp['ofs']['home']['conceded']['home'] += $val->ofs_a;
+                    // CRD
+                    $tmp['crd']['home']['events']['home']++;
+                    $tmp['crd']['home']['scored']['home'] += $val->crd_h;
+                    $tmp['crd']['home']['conceded']['home'] += $val->crd_a;
+                    // SNT
+                    $tmp['snt']['home']['events']['home']++;
+                    $tmp['snt']['home']['scored']['home'] += $val->snt_h;
+                    $tmp['snt']['home']['conceded']['home'] += $val->snt_a;
+                    // TSH
+                    $tmp['tsh']['home']['events']['home']++;
+                    $tmp['tsh']['home']['scored']['home'] += $val->tsh_h;
+                    $tmp['tsh']['home']['conceded']['home'] += $val->tsh_a;
 
-            }
-            // away home
-            if ($match->away_id == $val->home_id) {
-                // GLS
-                $tmp['gls']['away']['events']['home']++;
-                $tmp['gls']['away']['scored']['home'] += $val->gls_h;
-                $tmp['gls']['away']['conceded']['home'] += $val->gls_a;
-                // CRN
-                $tmp['crn']['away']['events']['home']++;
-                $tmp['crn']['away']['scored']['home'] += $val->crn_h;
-                $tmp['crn']['away']['conceded']['home'] += $val->crn_a;
-                // FLS
-                $tmp['fls']['away']['events']['home']++;
-                $tmp['fls']['away']['scored']['home'] += $val->fls_h;
-                $tmp['fls']['away']['conceded']['home'] += $val->fls_a;
-                // OFS
-                $tmp['ofs']['away']['events']['home']++;
-                $tmp['ofs']['away']['scored']['home'] += $val->ofs_h;
-                $tmp['ofs']['away']['conceded']['home'] += $val->ofs_a;
-                // CRD
-                $tmp['crd']['away']['events']['home']++;
-                $tmp['crd']['away']['scored']['home'] += $val->crd_h;
-                $tmp['crd']['away']['conceded']['home'] += $val->crd_a;
-                // SNT
-                $tmp['snt']['away']['events']['home']++;
-                $tmp['snt']['away']['scored']['home'] += $val->snt_h;
-                $tmp['snt']['away']['conceded']['home'] += $val->snt_a;
-                // TSH
-                $tmp['tsh']['away']['events']['home']++;
-                $tmp['tsh']['away']['scored']['home'] += $val->tsh_h;
-                $tmp['tsh']['away']['conceded']['home'] += $val->tsh_a;
-            }
-            //  home away
-            if ($match->home_id == $val->away_id) {
-                // GLS
-                $tmp['gls']['home']['events']['away']++;
-                $tmp['gls']['home']['scored']['away'] += $val->gls_a;
-                $tmp['gls']['home']['conceded']['away'] += $val->gls_h;
-                // CRN
-                $tmp['crn']['home']['events']['away']++;
-                $tmp['crn']['home']['scored']['away'] += $val->crn_a;
-                $tmp['crn']['home']['conceded']['away'] += $val->crn_h;
-                // FLS
-                $tmp['fls']['home']['events']['away']++;
-                $tmp['fls']['home']['scored']['away'] += $val->fls_a;
-                $tmp['fls']['home']['conceded']['away'] += $val->fls_h;
-                // OFS
-                $tmp['ofs']['home']['events']['away']++;
-                $tmp['ofs']['home']['scored']['away'] += $val->ofs_a;
-                $tmp['ofs']['home']['conceded']['away'] += $val->ofs_h;
-                // CRD
-                $tmp['crd']['home']['events']['away']++;
-                $tmp['crd']['home']['scored']['away'] += $val->crd_a;
-                $tmp['crd']['home']['conceded']['away'] += $val->crd_h;
-                // SNT
-                $tmp['snt']['home']['events']['away']++;
-                $tmp['snt']['home']['scored']['away'] += $val->snt_a;
-                $tmp['snt']['home']['conceded']['away'] += $val->snt_h;
-                // TSH
-                $tmp['tsh']['home']['events']['away']++;
-                $tmp['tsh']['home']['scored']['away'] += $val->tsh_a;
-                $tmp['tsh']['home']['conceded']['away'] += $val->tsh_h;
+                }
+                // away home
+                if ($match->away_id == $val->home_id) {
+                    // GLS
+                    $tmp['gls']['away']['events']['home']++;
+                    $tmp['gls']['away']['scored']['home'] += $val->gls_h;
+                    $tmp['gls']['away']['conceded']['home'] += $val->gls_a;
+                    // CRN
+                    $tmp['crn']['away']['events']['home']++;
+                    $tmp['crn']['away']['scored']['home'] += $val->crn_h;
+                    $tmp['crn']['away']['conceded']['home'] += $val->crn_a;
+                    // FLS
+                    $tmp['fls']['away']['events']['home']++;
+                    $tmp['fls']['away']['scored']['home'] += $val->fls_h;
+                    $tmp['fls']['away']['conceded']['home'] += $val->fls_a;
+                    // OFS
+                    $tmp['ofs']['away']['events']['home']++;
+                    $tmp['ofs']['away']['scored']['home'] += $val->ofs_h;
+                    $tmp['ofs']['away']['conceded']['home'] += $val->ofs_a;
+                    // CRD
+                    $tmp['crd']['away']['events']['home']++;
+                    $tmp['crd']['away']['scored']['home'] += $val->crd_h;
+                    $tmp['crd']['away']['conceded']['home'] += $val->crd_a;
+                    // SNT
+                    $tmp['snt']['away']['events']['home']++;
+                    $tmp['snt']['away']['scored']['home'] += $val->snt_h;
+                    $tmp['snt']['away']['conceded']['home'] += $val->snt_a;
+                    // TSH
+                    $tmp['tsh']['away']['events']['home']++;
+                    $tmp['tsh']['away']['scored']['home'] += $val->tsh_h;
+                    $tmp['tsh']['away']['conceded']['home'] += $val->tsh_a;
+                }
+                //  home away
+                if ($match->home_id == $val->away_id) {
+                    // GLS
+                    $tmp['gls']['home']['events']['away']++;
+                    $tmp['gls']['home']['scored']['away'] += $val->gls_a;
+                    $tmp['gls']['home']['conceded']['away'] += $val->gls_h;
+                    // CRN
+                    $tmp['crn']['home']['events']['away']++;
+                    $tmp['crn']['home']['scored']['away'] += $val->crn_a;
+                    $tmp['crn']['home']['conceded']['away'] += $val->crn_h;
+                    // FLS
+                    $tmp['fls']['home']['events']['away']++;
+                    $tmp['fls']['home']['scored']['away'] += $val->fls_a;
+                    $tmp['fls']['home']['conceded']['away'] += $val->fls_h;
+                    // OFS
+                    $tmp['ofs']['home']['events']['away']++;
+                    $tmp['ofs']['home']['scored']['away'] += $val->ofs_a;
+                    $tmp['ofs']['home']['conceded']['away'] += $val->ofs_h;
+                    // CRD
+                    $tmp['crd']['home']['events']['away']++;
+                    $tmp['crd']['home']['scored']['away'] += $val->crd_a;
+                    $tmp['crd']['home']['conceded']['away'] += $val->crd_h;
+                    // SNT
+                    $tmp['snt']['home']['events']['away']++;
+                    $tmp['snt']['home']['scored']['away'] += $val->snt_a;
+                    $tmp['snt']['home']['conceded']['away'] += $val->snt_h;
+                    // TSH
+                    $tmp['tsh']['home']['events']['away']++;
+                    $tmp['tsh']['home']['scored']['away'] += $val->tsh_a;
+                    $tmp['tsh']['home']['conceded']['away'] += $val->tsh_h;
 
+                }
+                //  away away
+                if ($match->away_id == $val->away_id) {
+                    // GLS
+                    $tmp['gls']['away']['events']['away']++;
+                    $tmp['gls']['away']['scored']['away'] += $val->gls_a;
+                    $tmp['gls']['away']['conceded']['away'] += $val->gls_h;
+                    // CRN
+                    $tmp['crn']['away']['events']['away']++;
+                    $tmp['crn']['away']['scored']['away'] += $val->crn_a;
+                    $tmp['crn']['away']['conceded']['away'] += $val->crn_h;
+                    // FLS
+                    $tmp['fls']['away']['events']['away']++;
+                    $tmp['fls']['away']['scored']['away'] += $val->fls_a;
+                    $tmp['fls']['away']['conceded']['away'] += $val->fls_h;
+                    // OFS
+                    $tmp['ofs']['away']['events']['away']++;
+                    $tmp['ofs']['away']['scored']['away'] += $val->ofs_a;
+                    $tmp['ofs']['away']['conceded']['away'] += $val->ofs_h;
+                    // CRD
+                    $tmp['crd']['away']['events']['away']++;
+                    $tmp['crd']['away']['scored']['away'] += $val->crd_a;
+                    $tmp['crd']['away']['conceded']['away'] += $val->crd_h;
+                    // SNT
+                    $tmp['snt']['away']['events']['away']++;
+                    $tmp['snt']['away']['scored']['away'] += $val->snt_a;
+                    $tmp['snt']['away']['conceded']['away'] += $val->snt_h;
+                    // TSH
+                    $tmp['tsh']['away']['events']['away']++;
+                    $tmp['tsh']['away']['scored']['away'] += $val->tsh_a;
+                    $tmp['tsh']['away']['conceded']['away'] += $val->tsh_h;
+                }
             }
-            //  away away
-            if ($match->away_id == $val->away_id) {
-                // GLS
-                $tmp['gls']['away']['events']['away']++;
-                $tmp['gls']['away']['scored']['away'] += $val->gls_a;
-                $tmp['gls']['away']['conceded']['away'] += $val->gls_h;
-                // CRN
-                $tmp['crn']['away']['events']['away']++;
-                $tmp['crn']['away']['scored']['away'] += $val->crn_a;
-                $tmp['crn']['away']['conceded']['away'] += $val->crn_h;
-                // FLS
-                $tmp['fls']['away']['events']['away']++;
-                $tmp['fls']['away']['scored']['away'] += $val->fls_a;
-                $tmp['fls']['away']['conceded']['away'] += $val->fls_h;
-                // OFS
-                $tmp['ofs']['away']['events']['away']++;
-                $tmp['ofs']['away']['scored']['away'] += $val->ofs_a;
-                $tmp['ofs']['away']['conceded']['away'] += $val->ofs_h;
-                // CRD
-                $tmp['crd']['away']['events']['away']++;
-                $tmp['crd']['away']['scored']['away'] += $val->crd_a;
-                $tmp['crd']['away']['conceded']['away'] += $val->crd_h;
-                // SNT
-                $tmp['snt']['away']['events']['away']++;
-                $tmp['snt']['away']['scored']['away'] += $val->snt_a;
-                $tmp['snt']['away']['conceded']['away'] += $val->snt_h;
-                // TSH
-                $tmp['tsh']['away']['events']['away']++;
-                $tmp['tsh']['away']['scored']['away'] += $val->tsh_a;
-                $tmp['tsh']['away']['conceded']['away'] += $val->tsh_h;
+
+            $cfHA = 2;
+
+            foreach ($tmp as $bet => $data) {
+                $expectations[$bet]['home'] = round((
+                    $data['home']['scored']['home'] * $cfHA +
+                    $data['home']['scored']['away'] +
+                    $data['away']['conceded']['away'] * $cfHA +
+                    $data['away']['conceded']['home']
+                ) / (
+                    $data['home']['events']['home'] * $cfHA +
+                    $data['home']['events']['away'] +
+                    $data['away']['events']['home'] +
+                    $data['away']['events']['away'] * $cfHA
+                ), 1);
+                $expectations[$bet]['away'] = round((
+                    $data['home']['conceded']['home'] * $cfHA +
+                    $data['home']['conceded']['away'] +
+                    $data['away']['scored']['away'] * $cfHA +
+                    $data['away']['scored']['home']
+                ) / (
+                    $data['home']['events']['home'] * $cfHA +
+                    $data['home']['events']['away'] +
+                    $data['away']['events']['home'] +
+                    $data['away']['events']['away'] * $cfHA
+                ), 1);
             }
+
+            ExpectationsMinMax::calc($expectations, $match);
         }
-
-        $cfHA = 2;
-
-        foreach ($tmp as $bet => $data) {
-            $expectations[$bet]['home'] = round((
-                $data['home']['scored']['home'] * $cfHA +
-                $data['home']['scored']['away'] +
-                $data['away']['conceded']['away'] * $cfHA +
-                $data['away']['conceded']['home']
-            ) / (
-                $data['home']['events']['home'] * $cfHA +
-                $data['home']['events']['away'] +
-                $data['away']['events']['home'] +
-                $data['away']['events']['away'] * $cfHA
-            ), 1);
-            $expectations[$bet]['away'] = round((
-                $data['home']['conceded']['home'] * $cfHA +
-                $data['home']['conceded']['away'] +
-                $data['away']['scored']['away'] * $cfHA +
-                $data['away']['scored']['home']
-            ) / (
-                $data['home']['events']['home'] * $cfHA +
-                $data['home']['events']['away'] +
-                $data['away']['events']['home'] +
-                $data['away']['events']['away'] * $cfHA
-            ), 1);
-        }
-        ExpectationsMinMax::calc($expectations, $match);
     }
 
     public static function sceleton()
diff --git a/app/Filament/Widgets/Boxes/Helper/ExpectationMethodA.php b/app/Filament/Widgets/Boxes/Helper/ExpectationMethodA.php
index 7f8bc8f1..9707ee35 100644
--- a/app/Filament/Widgets/Boxes/Helper/ExpectationMethodA.php
+++ b/app/Filament/Widgets/Boxes/Helper/ExpectationMethodA.php
@@ -6,6 +6,9 @@ use App\Models\StatistikoConfig;
 
 class ExpectationMethodA
 {
+    /**
+     * keep code to see how to add vars from DB
+     */
     public static function calc(array $expectations)
     {
         $summen = [];
@@ -19,37 +22,5 @@ class ExpectationMethodA
                 $summen[$name]['cnt'] = 1;
             }
         }
-
-        $summen2 = [];
-        $bets = ['gls', 'fls', 'ofs', 'crd', 'crn', 'snt', 'tsh'];
-        foreach ($bets as $name) {
-            $summen2[$name]['home']['sum'] = 0;
-            $summen2[$name]['home']['cnt'] = 0;
-            $summen2[$name]['away']['sum'] = 0;
-            $summen2[$name]['away']['cnt'] = 0;
-        }
-
-        foreach ($summen as $key => $value) {
-            foreach ($bets as $name) {
-                if (strpos($key, $name) !== false) {
-                    if (strpos($key, 'home') !== false) {
-                        $summen2[$name]['home']['sum'] += $value['sum'];
-                        $summen2[$name]['home']['cnt'] += +$value['cnt'];
-                    }
-                    if (strpos($key, 'away') !== false) {
-                        $summen2[$name]['away']['sum'] += $value['sum'];
-                        $summen2[$name]['away']['cnt'] += +$value['cnt'];
-                    }
-                }
-            }
-        }
-        $asp_result = [];
-
-        foreach ($summen2 as $bettype => $value) {
-            $asp_result[$bettype]['home'] = round($value['home']['sum'] / $value['home']['cnt'], 1);
-            $asp_result[$bettype]['away'] = round($value['away']['sum'] / $value['away']['cnt'], 1);
-        }
-
-        return $asp_result;
     }
 }
diff --git a/app/Filament/Widgets/Boxes/Helper/ExpectationMethodB.php b/app/Filament/Widgets/Boxes/Helper/ExpectationMethodB.php
deleted file mode 100644
index 9a8c09d9..00000000
--- a/app/Filament/Widgets/Boxes/Helper/ExpectationMethodB.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Filament\Widgets\Boxes\Helper;
-
-class ExpectationMethodB
-{
-    public static function calc(array $expectations)
-    {
-
-        // ok in pratica made = scored e got = conceded
-
-        $cfHA = 2;
-
-        $result = [];
-        foreach ($expectations as $bettype => $data) {
-            if ($data['team_home']['scored']['home']['evt'] && $data['team_away']['scored']['home']['evt']) {
-                $result[$bettype]['home'] = round((
-                    $data['team_home']['scored']['home']['sum'] * $cfHA +
-                    $data['team_home']['scored']['away']['sum'] +
-                    $data['team_away']['conceded']['away']['sum'] * $cfHA +
-                    $data['team_away']['conceded']['home']['sum']
-                ) / (
-                    $data['team_home']['scored']['home']['evt'] * $cfHA +
-                    $data['team_home']['scored']['away']['evt'] +
-                    $data['team_away']['conceded']['home']['evt'] +
-                    $data['team_away']['conceded']['away']['evt'] * $cfHA
-                ), 1);
-            }
-            if ($data['team_home']['scored']['home']['evt'] && $data['team_away']['scored']['home']['evt']) {
-                $result[$bettype]['away'] = round((
-                    $data['team_home']['conceded']['home']['sum'] * $cfHA +
-                    $data['team_home']['conceded']['away']['sum'] +
-                    $data['team_away']['scored']['away']['sum'] * $cfHA +
-                    $data['team_away']['scored']['home']['sum']
-                ) / (
-                    $data['team_home']['conceded']['home']['evt'] * $cfHA +
-                    $data['team_home']['conceded']['away']['evt'] +
-                    $data['team_away']['scored']['home']['evt'] +
-                    $data['team_away']['scored']['away']['evt'] * $cfHA
-                ), 1);
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/app/Filament/Widgets/Boxes/LoadPlayerAverages.php b/app/Filament/Widgets/Boxes/LoadPlayerAverages.php
index 813c4ac3..4f5aa728 100644
--- a/app/Filament/Widgets/Boxes/LoadPlayerAverages.php
+++ b/app/Filament/Widgets/Boxes/LoadPlayerAverages.php
@@ -16,77 +16,80 @@ class LoadPlayerAverages
 
         foreach ($players as $val) {
 
-            $res = StatistikoPlayer::whereIn('ss_player_id', $players)->get();
+            $res = StatistikoPlayer::whereIn('ss_player_id', $val->ss_player_id)->get();
 
-            $ss_player_id = (int) $val->ss_player_id;
-            $activeteam_id = (int) $val->activeteam_id;
-            $minutes_played = (int) $val->minutes_played;
-            $season = $val->event->season;
-            $home_id = (int) $val->event->home_id;
-            $away_id = (int) $val->event->away_id;
-            $startime = $val->event->starttime;
+            foreach ($res as $val) {
 
-            if ($startime->greaterThan(now()->subDays(180))) {
-                $last_180_days = true;
-            } else {
-                $last_180_days = false;
-            }
+                $ss_player_id = (int) $val->ss_player_id;
+                $activeteam_id = (int) $val->activeteam_id;
+                $minutes_played = (int) $val->minutes_played;
+                $season = $val->event->season;
+                $home_id = (int) $val->event->home_id;
+                $away_id = (int) $val->event->away_id;
+                $startime = $val->event->starttime;
 
-            if (! isset($arr[$ss_player_id])) {
-                self::array_template($arr, $ss_player_id);
-            }
+                if ($startime->greaterThan(now()->subDays(180))) {
+                    $last_180_days = true;
+                } else {
+                    $last_180_days = false;
+                }
 
-            if ($activeteam_id == $home_id) {
-                $arr[$ss_player_id]['events_played_home'] += 1;
-                $arr[$ss_player_id]['minutes_played_home'] += $minutes_played;
-                $arr[$ss_player_id]['events_played_home'] += 1;
-                $arr[$ss_player_id]['minutes_played_home'] += $minutes_played;
-                if ($last_180_days) {
+                if (! isset($arr[$ss_player_id])) {
+                    self::array_template($arr, $ss_player_id);
+                }
+
+                if ($activeteam_id == $home_id) {
                     $arr[$ss_player_id]['events_played_home'] += 1;
                     $arr[$ss_player_id]['minutes_played_home'] += $minutes_played;
-                }
-            } elseif ($activeteam_id == $away_id) {
-                $arr[$ss_player_id]['events_played_away'] += 1;
-                $arr[$ss_player_id]['minutes_played_away'] += $minutes_played;
-                $arr[$ss_player_id]['events_played_away'] += 1;
-                $arr[$ss_player_id]['minutes_played_away'] += $minutes_played;
-                if ($last_180_days) {
+                    $arr[$ss_player_id]['events_played_home'] += 1;
+                    $arr[$ss_player_id]['minutes_played_home'] += $minutes_played;
+                    if ($last_180_days) {
+                        $arr[$ss_player_id]['events_played_home'] += 1;
+                        $arr[$ss_player_id]['minutes_played_home'] += $minutes_played;
+                    }
+                } elseif ($activeteam_id == $away_id) {
                     $arr[$ss_player_id]['events_played_away'] += 1;
                     $arr[$ss_player_id]['minutes_played_away'] += $minutes_played;
+                    $arr[$ss_player_id]['events_played_away'] += 1;
+                    $arr[$ss_player_id]['minutes_played_away'] += $minutes_played;
+                    if ($last_180_days) {
+                        $arr[$ss_player_id]['events_played_away'] += 1;
+                        $arr[$ss_player_id]['minutes_played_away'] += $minutes_played;
+                    }
+
                 }
+                $cards = $val->card_yellow + $val->card_yellowred;
 
-            }
-            $cards = $val->card_yellow + $val->card_yellowred;
-
-            if ($season == 'last180days' && $last_180_days) {
-                $arr[$ss_player_id]['ss_player_id'] = $ss_player_id;
-                $arr[$ss_player_id]['season'] = 'last180days';
-                $arr[$ss_player_id]['total_events']++;
-                $arr[$ss_player_id]['total_min'] += $minutes_played;
-                $arr[$ss_player_id]['average_min'] = round($arr[$ss_player_id]['total_min'] / $arr[$ss_player_id]['total_events']);
-                $arr[$ss_player_id]['goals'] += $val->goals;
-                $arr[$ss_player_id]['fouls'] += $val->fouls;
-                $arr[$ss_player_id]['cards'] += $cards;
-                $arr[$ss_player_id]['offsides'] += $val->offsides;
-                $arr[$ss_player_id]['shots_on_target'] += $val->shots_on_target;
-                $arr[$ss_player_id]['shots_off_target'] += $val->shots_off_target;
-                $arr[$ss_player_id]['shots_blocked'] += $val->shots_blocked;
-                $arr[$ss_player_id]['total_shots'] += $val->shots_on_target + $val->shots_off_target + $val->shots_blocked;
-            }
-            if ($season != 'last180days') {
-                $arr[$ss_player_id]['ss_player_id'] = $ss_player_id;
-                $arr[$ss_player_id]['season'] = $season;
-                $arr[$ss_player_id]['total_events']++;
-                $arr[$ss_player_id]['total_min'] += $minutes_played;
-                $arr[$ss_player_id]['average_min'] = round($arr[$ss_player_id]['total_min'] / $arr[$ss_player_id]['total_events']);
-                $arr[$ss_player_id]['goals'] += $val->goals;
-                $arr[$ss_player_id]['fouls'] += $val->fouls;
-                $arr[$ss_player_id]['cards'] += $cards;
-                $arr[$ss_player_id]['offsides'] += $val->offsides;
-                $arr[$ss_player_id]['shots_on_target'] += $val->shots_on_target;
-                $arr[$ss_player_id]['shots_off_target'] += $val->shots_off_target;
-                $arr[$ss_player_id]['shots_blocked'] += $val->shots_blocked;
-                $arr[$ss_player_id]['total_shots'] += $val->shots_on_target + $val->shots_off_target + $val->shots_blocked;
+                if ($season == 'last180days' && $last_180_days) {
+                    $arr[$ss_player_id]['ss_player_id'] = $ss_player_id;
+                    $arr[$ss_player_id]['season'] = 'last180days';
+                    $arr[$ss_player_id]['total_events']++;
+                    $arr[$ss_player_id]['total_min'] += $minutes_played;
+                    $arr[$ss_player_id]['average_min'] = round($arr[$ss_player_id]['total_min'] / $arr[$ss_player_id]['total_events']);
+                    $arr[$ss_player_id]['goals'] += $val->goals;
+                    $arr[$ss_player_id]['fouls'] += $val->fouls;
+                    $arr[$ss_player_id]['cards'] += $cards;
+                    $arr[$ss_player_id]['offsides'] += $val->offsides;
+                    $arr[$ss_player_id]['shots_on_target'] += $val->shots_on_target;
+                    $arr[$ss_player_id]['shots_off_target'] += $val->shots_off_target;
+                    $arr[$ss_player_id]['shots_blocked'] += $val->shots_blocked;
+                    $arr[$ss_player_id]['total_shots'] += $val->shots_on_target + $val->shots_off_target + $val->shots_blocked;
+                }
+                if ($season != 'last180days') {
+                    $arr[$ss_player_id]['ss_player_id'] = $ss_player_id;
+                    $arr[$ss_player_id]['season'] = $season;
+                    $arr[$ss_player_id]['total_events']++;
+                    $arr[$ss_player_id]['total_min'] += $minutes_played;
+                    $arr[$ss_player_id]['average_min'] = round($arr[$ss_player_id]['total_min'] / $arr[$ss_player_id]['total_events']);
+                    $arr[$ss_player_id]['goals'] += $val->goals;
+                    $arr[$ss_player_id]['fouls'] += $val->fouls;
+                    $arr[$ss_player_id]['cards'] += $cards;
+                    $arr[$ss_player_id]['offsides'] += $val->offsides;
+                    $arr[$ss_player_id]['shots_on_target'] += $val->shots_on_target;
+                    $arr[$ss_player_id]['shots_off_target'] += $val->shots_off_target;
+                    $arr[$ss_player_id]['shots_blocked'] += $val->shots_blocked;
+                    $arr[$ss_player_id]['total_shots'] += $val->shots_on_target + $val->shots_off_target + $val->shots_blocked;
+                }
             }
         }
 
diff --git a/app/Filament/Widgets/Charts/LoadEvents/LoadEventsQueryAll.php b/app/Filament/Widgets/Charts/LoadEvents/LoadEventsQueryAll.php
index c0bff487..f9367282 100644
--- a/app/Filament/Widgets/Charts/LoadEvents/LoadEventsQueryAll.php
+++ b/app/Filament/Widgets/Charts/LoadEvents/LoadEventsQueryAll.php
@@ -28,7 +28,6 @@ class LoadEventsQueryAll
         $handicap_range = [];
         $total_range = [];
         if ($similar_past_matches != 'none') {
-            $team_id = 0;
             $ss_player_id = 0;
             $exp_handicap = $match->exp_away - $match->exp_home;
             $exp_total = $match->exp_away + $match->exp_home;