Changed to per data filtering
Added HotGoal detection