Made goalie detection better