PyPI - TopDownHockey-Scraper - Versions diffs - 5.0.1__py3-none-any.whl → 6.0.2__py3-none-any.whl - Mend - Supply Chain Defender

TopDownHockey-Scraper 5.0.1py3-none-any.whl → 6.0.2py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of TopDownHockey-Scraper might be problematic. Click here for more details.

Files changed (7) hide show

TopDownHockey_Scraper/TopDownHockey_NHL_Scraper.py CHANGED Viewed

@@ -19,6 +19,45 @@ import xmltodict
 from xml.parsers.expat import ExpatError
 from requests.exceptions import ChunkedEncodingError
+print('Successfully did local install plus update')
+team_names = ['ANAHEIM DUCKS',
+ 'ARIZONA COYOTES',
+ 'ATLANTA THRASHERS',
+ 'BOSTON BRUINS',
+ 'BUFFALO SABRES',
+ 'CALGARY FLAMES',
+ 'CHICAGO BLACKHAWKS',
+ 'COLORADO AVALANCHE',
+ 'COLUMBUS BLUE JACKETS',
+ 'DALLAS STARS',
+ 'DETROIT RED WINGS',
+ 'EDMONTON OILERS',
+ 'FLORIDA PANTHERS',
+ 'LOS ANGELES KINGS',
+ 'MINNESOTA WILD',
+ 'MONTRÉAL CANADIENS',
+ 'MONTREAL CANADIENS',
+ 'NASHVILLE PREDATORS',
+ 'NEW JERSEY DEVILS',
+ 'NEW YORK ISLANDERS',
+ 'NEW YORK RANGERS',
+ 'OTTAWA SENATORS',
+ 'PHILADELPHIA FLYERS',
+ 'PITTSBURGH PENGUINS',
+ 'PHOENIX COYOTES',
+ 'CAROLINA HURRICANES',
+ 'SAN JOSE SHARKS',
+ 'ST. LOUIS BLUES',
+ 'TAMPA BAY LIGHTNING',
+ 'TORONTO MAPLE LEAFS',
+ 'UTAH MAMMOTH',
+ 'VANCOUVER CANUCKS',
+ 'VEGAS GOLDEN KNIGHTS',
+ 'WASHINGTON CAPITALS',
+ 'WINNIPEG JETS',
+ 'SEATTLE KRAKEN']
 # ewc stands for "Events we care about."
 ewc = ['SHOT', 'HIT', 'BLOCK', 'MISS', 'GIVE', 'TAKE', 'GOAL']
@@ -231,16 +270,17 @@ def group_if_not_none(result):
     return(result)
 def scrape_html_roster(season, game_id):
     url = 'http://www.nhl.com/scores/htmlreports/' + season + '/RO0' + game_id + '.HTM'
     page = requests.get(url)
     soup = BeautifulSoup(page.content.decode('ISO-8859-1'), 'lxml', multi_valued_attributes = None)
     teamsoup = soup.find_all('td', {'align':'center', 'class':['teamHeading + border', 'teamHeading + border '], 'width':'50%'})
     away_team = teamsoup[0].get_text()
     home_team = teamsoup[1].get_text()
     home_player_soup = (soup.find_all('table', {'align':'center', 'border':'0', 'cellpadding':'0',
-                        'cellspacing':'0', 'width':'100%', 'xmlns:ext':''}))[1].find_all('td')
+                        'cellspacing':'0', 'width':'100%'}))[2].find_all('td')
     length = int(len(home_player_soup)/3)
@@ -251,7 +291,7 @@ def scrape_html_roster(season, game_id):
     home_player_df = home_player_df.drop(0).assign(team = 'home', team_name = home_team)
     away_player_soup = (soup.find_all('table', {'align':'center', 'border':'0', 'cellpadding':'0',
-                            'cellspacing':'0', 'width':'100%', 'xmlns:ext':''}))[0].find_all('td')
+                            'cellspacing':'0', 'width':'100%', }))[1].find_all('td')
     length = int(len(away_player_soup)/3)
@@ -260,15 +300,15 @@ def scrape_html_roster(season, game_id):
     away_player_df.columns = away_player_df.iloc[0]
     away_player_df = away_player_df.drop(0).assign(team = 'away', team_name = away_team)
     #global home_scratch_soup
     if len(soup.find_all('table', {'align':'center', 'border':'0', 'cellpadding':'0',
-                            'cellspacing':'0', 'width':'100%', 'xmlns:ext':''}))>3:
+                            'cellspacing':'0', 'width':'100%', }))>3:
         home_scratch_soup = (soup.find_all('table', {'align':'center', 'border':'0', 'cellpadding':'0',
-                                'cellspacing':'0', 'width':'100%', 'xmlns:ext':''}))[3].find_all('td')
+                                'cellspacing':'0', 'width':'100%', }))[4].find_all('td')
         if len(home_scratch_soup)>1:
             length = int(len(home_scratch_soup)/3)
@@ -284,10 +324,10 @@ def scrape_html_roster(season, game_id):
         home_scratch_df = pd.DataFrame()
     if len(soup.find_all('table', {'align':'center', 'border':'0', 'cellpadding':'0',
-                            'cellspacing':'0', 'width':'100%', 'xmlns:ext':''}))>2:
+                            'cellspacing':'0', 'width':'100%', }))>2:
         away_scratch_soup = (soup.find_all('table', {'align':'center', 'border':'0', 'cellpadding':'0',
-                                'cellspacing':'0', 'width':'100%', 'xmlns:ext':''}))[2].find_all('td')
+                                'cellspacing':'0', 'width':'100%', }))[3].find_all('td')
         if len(away_scratch_soup)>1:
@@ -306,31 +346,34 @@ def scrape_html_roster(season, game_id):
     player_df = pd.concat([home_player_df, away_player_df]).assign(status = 'player')
     scratch_df = pd.concat([home_scratch_df, away_scratch_df]).assign(status = 'scratch')
     roster_df = pd.concat([player_df, scratch_df])
     roster_df = roster_df.assign(team = np.where(roster_df.team=='CANADIENS MONTREAL', 'MONTREAL CANADIENS', roster_df.team))
+    roster_df = roster_df.assign(team = np.where(roster_df.team=='MONTRÉAL CANADIENS', 'MONTREAL CANADIENS', roster_df.team))
     # FIX NAMES
     roster_df = roster_df.rename(columns = {'Nom/Name':'Name'})
-    roster_df.Name = roster_df.Name.str.split('(').str[0].str.strip()
+    roster_df.Name = roster_df.Name.apply(lambda x: re.sub(r' \(A\)$', '', x).strip())
+    roster_df.Name = roster_df.Name.apply(lambda x: re.sub(r' \(C\)$', '', x).strip())
     # Max Pacioretty doesn't exist in ESPN in 2009-2010, sadly.
     roster_df['Name'] = np.where(roster_df['Name'].str.contains('ALEXANDRE '),
                                 roster_df.Name.str.replace('ALEXANDRE ', 'ALEX '),
                                 roster_df['Name'])
     roster_df['Name'] = np.where(roster_df['Name'].str.contains('ALEXANDER '),
                                 roster_df.Name.str.replace('ALEXANDER ', 'ALEX '),
                                 roster_df['Name'])
     roster_df['Name'] = np.where(roster_df['Name'].str.contains('CHRISTOPHER '),
                                 roster_df.Name.str.replace('CHRISTOPHER ', 'CHRIS '),
                                 roster_df['Name'])
     # List of names and fixed from Evolving Hockey Scraper.
     roster_df = roster_df.assign(Name =
     (np.where(roster_df['Name']== "ANDREI KASTSITSYN" , "ANDREI KOSTITSYN",
     (np.where(roster_df['Name']== "AJ GREER" , "A.J. GREER",
@@ -434,7 +477,7 @@ def scrape_html_roster(season, game_id):
     roster_df['Name']))))))))))))))))))))))))))))))))))))))))))))))))))))))
     )))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
     ))))))))))
     roster_df['Name'] = (np.where(roster_df['Name']== "RODNEY PELLEY" , "ROD PELLEY",
     (np.where(roster_df['Name']== "SIARHEI KASTSITSYN" , "SERGEI KOSTITSYN",
     (np.where(roster_df['Name']== "SIMEON VARLAMOV" , "SEMYON VARLAMOV",
@@ -475,7 +518,7 @@ def scrape_html_roster(season, game_id):
     (np.where(roster_df['Name']== "MATTIAS JANMARK-NYLEN" , "MATTIAS JANMARK",
     (np.where(roster_df['Name']== "JOSH DUNNE" , "JOSHUA DUNNE",roster_df['Name'])))))))))))))))))))))))))))))))))))))))))))
     )))))))))))))))))))))))))))))))))))
     roster_df['Name'] = np.where((roster_df['Name']=="SEBASTIAN AHO") & (roster_df['Pos']=='D'), 'SEBASTIAN AHO SWE', roster_df['Name'])
     roster_df['Name'] = np.where((roster_df['Name']=="ELIAS PETTERSSON") & (roster_df['Pos']=='D'), 'ELIAS PETTERSSON(D)', roster_df['Name'])
     roster_df['Name'] = np.where((roster_df['Name']=="COLIN WHITE") & (roster_df['Pos']=='D'), 'COLIN WHITE CAN', roster_df['Name'])
@@ -504,454 +547,374 @@ def scrape_html_roster(season, game_id):
         (np.where(roster_df['Name']== "EMIL LILLEBERG" , "EMIL MARTINSEN LILLEBERG",
         (np.where(roster_df['Name']== "CAMERON ATKINSON" , "CAM ATKINSON",
         (np.where(roster_df['Name']== "JURAJ SLAFKOVSKA" , "JURAJ SLAFKOVSKY",
-        roster_df['Name']))))))))))))))))))))))))))))))))))
+        (np.where(roster_df['Name']== "MARTIN FEHARVARY" ,  "MARTIN FEHERVARY",
+        roster_df['Name']))))))))))))))))))))))))))))))))))))
     roster_df['Name'] = roster_df['Name'].str.normalize('NFKD').str.encode('ascii', errors='ignore').str.decode('utf-8').str.upper()
     roster_df['Name'] = np.where(roster_df['Name']== "JURAJ SLAFKOVSKA" , "JURAJ SLAFKOVSKY", roster_df['Name']) # Need to do this after normalization, only then he becomes Slafkovska?
+    roster_df['Name'] = np.where(roster_df['Name']== "JOHN (JACK) ROSLOVIC" , "JACK ROSLOVIC", roster_df['Name'])
+    roster_df['Name'] = np.where(roster_df['Name']== "ANTHONY-JOHN (AJ) GREER" , "A.J. GREER", roster_df['Name'])
+    roster_df['Name'] = np.where(roster_df['Name']== "MARTIN FEHARVARY" , "MARTIN FEHERVARY", roster_df['Name'])
+    roster_df['Name'] = np.where(roster_df['Name']== "MATAJ  BLAMEL" , "MATAJ BLAMEL", roster_df['Name'])
+    roster_df['Name'] = roster_df['Name'].str.replace('  ', ' ')
     return roster_df
-def scrape_html_shifts(season, game_id):
+def scrape_html_shifts(season, game_id, live = True):
+    goalie_names = ['AARON DELL',
+                     'ADAM HUSKA',
+                     'ADAM WERNER',
+                     'ADAM WILCOX',
+                     'ADIN HILL',
+                     'AKIRA SCHMID',
+                     'AL MONTOYA',
+                     'ALEKSEI KOLOSOV',
+                     'ALES STEZKA',
+                     'ALEX AULD',
+                     'ALEX LYON',
+                     'ALEX NEDELJKOVIC',
+                     'ALEX PECHURSKI',
+                     'ALEX SALAK',
+                     'ALEX STALOCK',
+                     'ALEXANDAR GEORGIEV',
+                     'ALEXEI MELNICHUK',
+                     'ALLEN YORK',
+                     'ANDERS LINDBACK',
+                     'ANDERS NILSSON',
+                     'ANDREI VASILEVSKIY',
+                     'ANDREW HAMMOND',
+                     'ANDREW RAYCROFT',
+                     'ANDREY MAKAROV',
+                     'ANTERO NIITTYMAKI',
+                     'ANTHONY STOLARZ',
+                     'ANTOINE BIBEAU',
+                     'ANTON FORSBERG',
+                     'ANTON KHUDOBIN',
+                     'ANTTI NIEMI',
+                     'ANTTI RAANTA',
+                     'ARTURS SILOVS',
+                     'ARTYOM ZAGIDULIN',
+                     'ARVID SODERBLOM',
+                     'BEN BISHOP',
+                     'BEN SCRIVENS',
+                     'BRAD THIESSEN',
+                     'BRADEN HOLTBY',
+                     'BRANDON HALVERSON',
+                     'BRENT JOHNSON',
+                     'BRENT KRAHN',
+                     'BRIAN BOUCHER',
+                     'BRIAN ELLIOTT',
+                     'BRIAN FOSTER',
+                     'CAL PETERSEN',
+                     'CALVIN HEETER',
+                     'CALVIN PETERSEN',
+                     'CALVIN PICKARD',
+                     'CAM TALBOT',
+                     'CAM WARD',
+                     'CAREY PRICE',
+                     'CARTER HART',
+                     'CARTER HUTTON',
+                     'CASEY DESMITH',
+                     'CAYDEN PRIMEAU',
+                     'CEDRICK DESJARDINS',
+                     'CHAD JOHNSON',
+                     'CHARLIE LINDGREN',
+                     'CHRIS BECKFORD-TSEU',
+                     'CHRIS DRIEDGER',
+                     'CHRIS GIBSON',
+                     'CHRIS HOLT',
+                     'CHRIS MASON',
+                     'CHRIS OSGOOD',
+                     'COLLIN DELIA',
+                     'CONNOR HELLEBUYCK',
+                     'CONNOR INGRAM',
+                     'CONNOR KNAPP',
+                     'COREY CRAWFORD',
+                     'CORY SCHNEIDER',
+                     'CRAIG ANDERSON',
+                     'CRISTOBAL HUET',
+                     'CRISTOPHER NILSTORP',
+                     'CURTIS JOSEPH',
+                     'CURTIS MCELHINNEY',
+                     'CURTIS SANFORD',
+                     'DAN CLOUTIER',
+                     'DAN ELLIS',
+                     'DAN VLADAR',
+                     'DANIEL LACOSTA',
+                     'DANIEL TAYLOR',
+                     'DANIIL TARASOV',
+                     'DANY SABOURIN',
+                     'DARCY KUEMPER',
+                     'DAVID AEBISCHER',
+                     'DAVID AYRES',
+                     'DAVID LENEVEU',
+                     'DAVID RITTICH',
+                     'DENNIS HILDEBY',
+                     'DEVAN DUBNYK',
+                     'DEVIN COOLEY',
+                     'DEVON LEVI',
+                     'DIMITRI PATZOLD',
+                     'DOMINIK HASEK',
+                     'DREW COMMESSO',
+                     'DREW MACINTYRE',
+                     'DUSTIN TOKARSKI',
+                     'DUSTIN WOLF',
+                     'DWAYNE ROLOSON',
+                     'DYLAN FERGUSON',
+                     'DYLAN WELLS',
+                     'EDDIE LACK',
+                     'EDWARD PASQUALE',
+                     'EETU MAKINIEMI',
+                     'ELVIS MERZLIKINS',
+                     'ERIC COMRIE',
+                     'ERIK ERSBERG',
+                     'ERIK KALLGREN',
+                     'ERIK PORTILLO',
+                     'EVGENI NABOKOV',
+                     'FELIX SANDSTROM',
+                     'FILIP GUSTAVSSON',
+                     'FREDERIK ANDERSEN',
+                     'FREDRIK NORRENA',
+                     'GARRET SPARKS',
+                     'GEORGI ROMANOV',
+                     'GILLES SENN',
+                     'HANNU TOIVONEN',
+                     'HARRI SATERI',
+                     'HENRIK KARLSSON',
+                     'HENRIK LUNDQVIST',
+                     'HUGO ALNEFELT',
+                     'HUNTER MISKA',
+                     'HUNTER SHEPARD',
+                     'IGOR SHESTERKIN',
+                     'IIRO TARKKI',
+                     'ILYA BRYZGALOV',
+                     'ILYA SAMSONOV',
+                     'ILYA SOROKIN',
+                     'IVAN FEDOTOV',
+                     'IVAN PROSVETOV',
+                     'J-F BERUBE',
+                     'JACK CAMPBELL',
+                     'JACK LAFONTAINE',
+                     'JACOB MARKSTROM',
+                     'JAKE ALLEN',
+                     'JAKE OETTINGER',
+                     'JAKUB DOBES',
+                     'JAKUB SKAREK',
+                     'JAMES REIMER',
+                     'JARED COREAU',
+                     'JAROSLAV HALAK',
+                     'JASON KASDORF',
+                     'JASON LABARBERA',
+                     'JAXSON STAUBER',
+                     'JEAN-SEBASTIEN AUBIN',
+                     'JEAN-SEBASTIEN GIGUERE',
+                     'JEFF DESLAURIERS',
+                     'JEFF FRAZEE',
+                     'JEFF GLASS',
+                     'JEFF ZATKOFF',
+                     'JEREMY DUCHESNE',
+                     'JEREMY SMITH',
+                     'JEREMY SWAYMAN',
+                     'JESPER WALLSTEDT',
+                     'JET GREAVES',
+                     'JHONAS ENROTH',
+                     'JIMMY HOWARD',
+                     'JIRI PATERA',
+                     'JOACIM ERIKSSON',
+                     'JOCELYN THIBAULT',
+                     'JOEL BLOMQVIST',
+                     'JOEL HOFER',
+                     'JOEY DACCORD',
+                     'JOEY MACDONALD',
+                     'JOHAN BACKLUND',
+                     'JOHAN HEDBERG',
+                     'JOHAN HOLMQVIST',
+                     'JOHN CURRY',
+                     'JOHN GIBSON',
+                     'JOHN GRAHAME',
+                     'JON GILLIES',
+                     'JONAS GUSTAVSSON',
+                     'JONAS HILLER',
+                     'JONAS JOHANSSON',
+                     'JONATHAN BERNIER',
+                     'JONATHAN QUICK',
+                     'JONI ORTIO',
+                     'JOONAS KORPISALO',
+                     'JORDAN BINNINGTON',
+                     'JOSE THEODORE',
+                     'JOSEF KORENAR',
+                     'JOSEPH WOLL',
+                     'JOSH HARDING',
+                     'JOSH TORDJMAN',
+                     'JUSSI RYNNAS',
+                     'JUSTIN PETERS',
+                     'JUSTIN POGGE',
+                     'JUSTUS ANNUNEN',
+                     'JUUSE SAROS',
+                     'KAAPO KAHKONEN',
+                     'KADEN FULCHER',
+                     'KAREL VEJMELKA',
+                     'KARI LEHTONEN',
+                     'KARRI RAMO',
+                     'KASIMIR KASKISUO',
+                     'KEITH KINKAID',
+                     'KEN APPLEBY',
+                     'KENNETH APPLEBY',
+                     'KENT SIMPSON',
+                     'KEVIN BOYLE',
+                     'KEVIN LANKINEN',
+                     'KEVIN MANDOLESE',
+                     'KEVIN POULIN',
+                     'KEVIN WEEKES',
+                     'KRISTERS GUDLEVSKIS',
+                     'LANDON BOW',
+                     'LAURENT BROSSOIT',
+                     'LEEVI MERILAINEN',
+                     'LELAND IRVING',
+                     'LINUS ULLMARK',
+                     'LOGAN THOMPSON',
+                     'LOUIS DOMINGUE',
+                     'LUKAS DOSTAL',
+                     'MACKENZIE BLACKWOOD',
+                     'MACKENZIE SKAPSKI',
+                     'MADS SOGAARD',
+                     'MAGNUS CHRONA',
+                     'MAGNUS HELLBERG',
+                     'MALCOLM SUBBAN',
+                     'MANNY FERNANDEZ',
+                     'MANNY LEGACE',
+                     'MARC DENIS',
+                     'MARC-ANDRE FLEURY',
+                     'MARCUS HOGBERG',
+                     'MAREK LANGHAMER',
+                     'MAREK MAZANEC',
+                     'MAREK SCHWARZ',
+                     'MARK DEKANICH',
+                     'MARK VISENTIN',
+                     'MARTIN BIRON',
+                     'MARTIN BRODEUR',
+                     'MARTIN GERBER',
+                     'MARTIN JONES',
+                     'MARTY TURCO',
+                     'MATHIEU GARON',
+                     'MATISS KIVLENIEKS',
+                     'MATT CLIMIE',
+                     'MATT HACKETT',
+                     'MATT KEETLEY',
+                     'MATT MURRAY',
+                     'MATT TOMKINS',
+                     'MATT VILLALTA',
+                     'MATT ZABA',
+                     "MATTHEW O'CONNOR",
+                     'MAXIME LAGACE',
+                     'MICHAEL DIPIETRO',
+                     'MICHAEL HOUSER',
+                     'MICHAEL HUTCHINSON',
+                     'MICHAEL LEIGHTON',
+                     'MICHAEL MCNIVEN',
+                     'MICHAL NEUVIRTH',
+                     'MIIKKA KIPRUSOFF',
+                     'MIKAEL TELLQVIST',
+                     'MIKE BRODEUR',
+                     'MIKE CONDON',
+                     'MIKE MCKENNA',
+                     'MIKE MURPHY',
+                     'MIKE SMITH',
+                     'MIKKO KOSKINEN',
+                     'NATHAN LAWSON',
+                     'NATHAN LIEUWEN',
+                     'NICO DAWS',
+                     'NIKITA TOLOPILO',
+                     'NIKKE KOKKO',
+                     'NIKLAS BACKSTROM',
+                     'NIKLAS SVEDBERG',
+                     'NIKLAS TREUTLE',
+                     'NIKOLAI KHABIBULIN',
+                     'OLIE KOLZIG',
+                     'OLIVIER RODRIGUE',
+                     'OLLE ERIKSSON EK',
+                     'ONDREJ PAVELEC',
+                     'OSCAR DANSK',
+                     'PASCAL LECLAIRE',
+                     'PATRICK LALIME',
+                     'PAVEL FRANCOUZ',
+                     'PEKKA RINNE',
+                     'PETER BUDAJ',
+                     'PETER MANNINO',
+                     'PETR MRAZEK',
+                     'PHEONIX COPLEY',
+                     'PHILIPP GRUBAUER',
+                     'PYOTR KOCHETKOV',
+                     'RAY EMERY',
+                     'RETO BERRA',
+                     'RICHARD BACHMAN',
+                     'RICK DIPIETRO',
+                     'RIKU HELENIUS',
+                     'ROB ZEPP',
+                     'ROBERTO LUONGO',
+                     'ROBIN LEHNER',
+                     'ROMAN WILL',
+                     'RYAN MILLER',
+                     'SAM MONTEMBEAULT',
+                     'SAMUEL MONTEMBEAULT',
+                     'SAMI AITTOKALLIO',
+                     'SAMUEL ERSSON',
+                     'SCOTT CLEMMENSEN',
+                     'SCOTT DARLING',
+                     'SCOTT FOSTER',
+                     'SCOTT WEDGEWOOD',
+                     'SEBASTIAN COSSA',
+                     'SEBASTIEN CARON',
+                     'SEMYON VARLAMOV',
+                     'SERGEI BOBROVSKY',
+                     'SPENCER KNIGHT',
+                     'SPENCER MARTIN',
+                     'STEVE MASON',
+                     'STEVE VALIQUETTE',
+                     'STUART SKINNER',
+                     'THATCHER DEMKO',
+                     'THOMAS GREISS',
+                     'THOMAS HODGES',
+                     'TIM THOMAS',
+                     'TIMO PIELMEIER',
+                     'TOBIAS STEPHAN',
+                     'TOM MCCOLLUM',
+                     'TOMAS VOKOUN',
+                     'TRENT MINER',
+                     'TRISTAN JARRY',
+                     'TRISTAN LENNOX',
+                     'TROY GROSENICK',
+                     'TUUKKA RASK',
+                     'TY CONKLIN',
+                     'TYLER BUNZ',
+                     'TYLER WEIMAN',
+                     'UKKO-PEKKA LUUKKONEN',
+                     'VEINI VEHVILAINEN',
+                     'VESA TOSKALA',
+                     'VICTOR OSTMAN',
+                     'VIKTOR FASTH',
+                     'VILLE HUSSO',
+                     'VITEK VANECEK',
+                     'WADE DUBIELEWICZ',
+                     'YANIV PERETS',
+                     'YANN DANIS',
+                     'YAROSLAV ASKAROV',
+                     'ZACH FUCALE',
+                     'ZACH SAWCHENKO',
+                     'ZANE MCINTYRE']
     url = 'http://www.nhl.com/scores/htmlreports/' + season + '/TH0' + game_id + '.HTM'
     page = (requests.get(url))
-    soup = BeautifulSoup(page.content.decode('ISO-8859-1'), 'lxml', multi_valued_attributes = None)
-    found = soup.find_all('td', {'class':['playerHeading + border', 'lborder + bborder']})
+    home_soup = BeautifulSoup(page.content)
+    found = home_soup.find_all('td', {'class':['playerHeading + border', 'lborder + bborder']})
     if len(found)==0:
         raise IndexError('This game has no shift data.')
-    thisteam = soup.find('td', {'align':'center', 'class':'teamHeading + border'}).get_text()
-    goalie_names = ['AARON DELL',
- 'AARON SOROCHAN',
- 'ADAM HUSKA',
- 'ADAM WERNER',
- 'ADAM WILCOX',
- 'ADIN HILL',
- 'AKIRA SCHMID',
- 'AL MONTOYA',
- 'ALEKSEI KOLOSOV',
- 'ALEX AULD',
- "ALEX D'ORIO",
- 'ALEX LYON',
- 'ALEX NEDELJKOVIC',
- 'ALEX PECHURSKI',
- 'ALEX SALAK',
- 'ALEX STALOCK',
- 'ALEXANDAR GEORGIEV',
- 'ALEXEI MELNICHUK',
- 'ALLEN YORK',
- 'ANDERS LINDBACK',
- 'ANDERS NILSSON',
- 'ANDREI VASILEVSKIY',
- 'ANDREW HAMMOND',
- 'ANDREW RAYCROFT',
- 'ANDREY MAKAROV',
- 'ANGUS REDMOND',
- 'ANTERO NIITTYMAKI',
- 'ANTHONY STOLARZ',
- 'ANTOINE BIBEAU',
- 'ANTON FORSBERG',
- 'ANTON KHUDOBIN',
- 'ANTTI NIEMI',
- 'ANTTI RAANTA',
- 'ARTURS SILOVS',
- 'ARTYOM ZAGIDULIN',
- 'ARVID SODERBLOM',
- 'BEN BISHOP',
- 'BEN SCRIVENS',
- 'BEN WEXLER',
- 'BRAD THIESSEN',
- 'BRADEN HOLTBY',
- 'BRANDON HALVERSON',
- 'BRENT JOHNSON',
- 'BRENT KRAHN',
- 'BRETT LEONHARDT',
- 'BRIAN BOUCHER',
- 'BRIAN ELLIOTT',
- 'BRIAN FOSTER',
- 'BRYAN PITTON',
- 'CAL PETERSEN',
- 'CALVIN HEETER',
- 'CALVIN PETERSEN',
- 'CALVIN PICKARD',
- 'CAM TALBOT',
- 'CAM WARD',
- 'CAMERON JOHNSON',
- 'CAREY PRICE',
- 'CARTER HART',
- 'CARTER HUTTON',
- 'CASEY DESMITH',
- 'CAYDEN PRIMEAU',
- 'CEDRICK DESJARDINS',
- 'CHAD JOHNSON',
- 'CHARLIE LINDGREN',
- 'CHET PICKARD',
- 'CHRIS BECKFORD-TSEU',
- 'CHRIS DRIEDGER',
- 'CHRIS GIBSON',
- 'CHRIS HOLT',
- 'CHRIS MASON',
- 'CHRIS OSGOOD',
- 'COLE KEHLER',
- 'COLLIN DELIA',
- 'CONNOR HELLEBUYCK',
- 'CONNOR INGRAM',
- 'CONNOR KNAPP',
- 'COREY CRAWFORD',
- 'CORY SCHNEIDER',
- 'CRAIG ANDERSON',
- 'CRISTOBAL HUET',
- 'CRISTOPHER NILSTORP',
- 'CURTIS JOSEPH',
- 'CURTIS MCELHINNEY',
- 'CURTIS SANFORD',
- 'DAN CLOUTIER',
- 'DAN ELLIS',
- 'DAN TURPLE',
- 'DAN VLADAR',
- 'DANIEL ALTSHULLER',
- 'DANIEL LACOSTA',
- 'DANIEL LARSSON',
- 'DANIEL MANZATO',
- 'DANIEL TAYLOR',
- 'DANIIL TARASOV',
- 'DANY SABOURIN',
- 'DARCY KUEMPER',
- 'DAREN MACHESNEY',
- 'DAVID AEBISCHER',
- 'DAVID AYRES',
- 'DAVID LENEVEU',
- 'DAVID RITTICH',
- 'DAVID SHANTZ',
- 'DENNIS ENDRAS',
- 'DENNIS HILDEBY',
- 'DERECK BARIBEAU',
- 'DEVAN DUBNYK',
- 'DEVIN COOLEY',
- 'DEVON LEVI',
- 'DIMITRI PATZOLD',
- 'DOMINIK HASEK',
- 'DREW COMMESSO',
- 'DREW MACINTYRE',
- 'DUSTIN BUTLER',
- 'DUSTIN TOKARSKI',
- 'DUSTIN WOLF',
- 'DUSTYN ZENNER',
- 'DWAYNE ROLOSON',
- 'DYLAN FERGUSON',
- 'DYLAN WELLS',
- 'EAMON MCADAM',
- 'EDDIE LACK',
- 'EDWARD PASQUALE',
- 'EETU MAKINIEMI',
- 'ELVIS MERZLIKINS',
- 'EMIL LARMI',
- 'ERIC COMRIE',
- 'ERIC HARTZELL',
- 'ERIC SEMBORSKI',
- 'ERIK ERSBERG',
- 'ERIK KALLGREN',
- 'ERIK PORTILLO',
- 'EVAN CORMIER',
- 'EVAN FITZPATRICK',
- 'EVGENI NABOKOV',
- 'FELIX SANDSTROM',
- 'FILIP GUSTAVSSON',
- 'FRED BRATHWAITE',
- 'FREDERIC CASSIVI',
- 'FREDERIK ANDERSEN',
- 'FREDRIK NORRENA',
- 'GARRET SPARKS',
- 'GAVIN MCHALE',
- 'GEORGI ROMANOV',
- 'GERALD COLEMAN',
- 'GILLES SENN',
- 'HANNU TOIVONEN',
- 'HARRI SATERI',
- 'HENRIK KARLSSON',
- 'HENRIK LUNDQVIST',
- 'HUGO ALNEFELT',
- 'HUNTER MISKA',
- 'HUNTER SHEPARD',
- 'IGOR BOBKOV',
- 'IGOR SHESTERKIN',
- 'IIRO TARKKI',
- 'ILYA BRYZGALOV',
- 'ILYA SAMSONOV',
- 'ILYA SOROKIN',
- 'IVAN FEDOTOV',
- 'IVAN PROSVETOV',
- 'J-F BERUBE',
- 'J.F. BERUBE',
- 'JACK CAMPBELL',
- 'JACK LAFONTAINE',
- 'JACOB MARKSTROM',
- 'JAKE ALLEN',
- 'JAKE OETTINGER',
- 'JAMES REIMER',
- 'JARED COREAU',
- 'JAROSLAV HALAK',
- 'JASON BACASHIHUA',
- 'JASON KASDORF',
- 'JASON LABARBERA',
- 'JASON MISSIAEN',
- 'JAXSON STAUBER',
- 'JEAN-PHILIPPE LEVASSEUR',
- 'JEAN-SEBASTIEN AUBIN',
- 'JEAN-SEBASTIEN GIGUERE',
- 'JEFF DESLAURIERS',
- 'JEFF FRAZEE',
- 'JEFF GLASS',
- 'JEFF TYNI',
- 'JEFF ZATKOFF',
- 'JEREMY DUCHESNE',
- 'JEREMY SMITH',
- 'JEREMY SWAYMAN',
- 'JESPER WALLSTEDT',
- 'JET GREAVES',
- 'JHONAS ENROTH',
- 'JIMMY HOWARD',
- 'JIRI PATERA',
- 'JOACIM ERIKSSON',
- 'JOCELYN THIBAULT',
- 'JOE CANNATA',
- 'JOE FALLON',
- 'JOEL BLOMQVIST',
- 'JOEL HOFER',
- 'JOEL MARTIN',
- 'JOEY DACCORD',
- 'JOEY MACDONALD',
- 'JOHAN BACKLUND',
- 'JOHAN GUSTAFSSON',
- 'JOHAN HEDBERG',
- 'JOHAN HOLMQVIST',
- 'JOHN CURRY',
- 'JOHN GIBSON',
- 'JOHN GRAHAME',
- 'JOHN MUSE',
- 'JON GILLIES',
- 'JON-PAUL ANDERSON',
- 'JONAS GUSTAVSSON',
- 'JONAS HILLER',
- 'JONAS JOHANSSON',
- 'JONATHAN BERNIER',
- 'JONATHAN BOUTIN',
- 'JONATHAN QUICK',
- 'JONI ORTIO',
- 'JOONAS KORPISALO',
- 'JORDAN BINNINGTON',
- 'JORDAN PEARCE',
- 'JORDAN SIGALET',
- 'JORDAN WHITE',
- 'JORGE ALVES',
- 'JOSE THEODORE',
- 'JOSEF KORENAR',
- 'JOSEPH WOLL',
- 'JOSH HARDING',
- 'JOSH TORDJMAN',
- 'JUSSI RYNNAS',
- 'JUSTIN KOWALKOSKI',
- 'JUSTIN PETERS',
- 'JUSTIN POGGE',
- 'JUSTUS ANNUNEN',
- 'JUUSE SAROS',
- 'JUUSO RIKSMAN',
- 'KAAPO KAHKONEN',
- 'KADEN FULCHER',
- 'KAREL VEJMELKA',
- 'KARI LEHTONEN',
- 'KARRI RAMO',
- 'KASIMIR KASKISUO',
- 'KEITH KINKAID',
- 'KEN APPLEBY',
- 'KENNETH APPLEBY',
- 'KENT SIMPSON',
- 'KEVIN BOYLE',
- 'KEVIN LANKINEN',
- 'KEVIN MANDOLESE',
- 'KEVIN NASTIUK',
- 'KEVIN POULIN',
- 'KEVIN WEEKES',
- 'KRISTERS GUDLEVSKIS',
- 'KURTIS MUCHA',
- 'LANDON BOW',
- 'LARS JOHANSSON',
- 'LAURENT BROSSOIT',
- 'LEEVI MERILAINEN',
- 'LELAND IRVING',
- 'LINUS ULLMARK',
- 'LOGAN THOMPSON',
- 'LOUIS DOMINGUE',
- 'LUKAS DOSTAL',
- 'MACKENZIE BLACKWOOD',
- 'MACKENZIE SKAPSKI',
- 'MADS SOGAARD',
- 'MAGNUS CHRONA',
- 'MAGNUS HELLBERG',
- 'MALCOLM SUBBAN',
- 'MANNY FERNANDEZ',
- 'MANNY LEGACE',
- 'MARC CHEVERIE',
- 'MARC DENIS',
- 'MARC-ANDRE FLEURY',
- 'MARCUS HOGBERG',
- 'MAREK LANGHAMER',
- 'MAREK MAZANEC',
- 'MAREK SCHWARZ',
- 'MARK DEKANICH',
- 'MARK VISENTIN',
- 'MARTIN BIRON',
- 'MARTIN BRODEUR',
- 'MARTIN GERBER',
- 'MARTIN JONES',
- 'MARTY TURCO',
- 'MAT ROBSON',
- 'MATHIEU CORBEIL',
- 'MATHIEU GARON',
- 'MATISS KIVLENIEKS',
- 'MATT CLIMIE',
- 'MATT DALTON',
- 'MATT HACKETT',
- 'MATT KEETLEY',
- 'MATT MURRAY',
- 'MATT TOMKINS',
- 'MATT VILLALTA',
- 'MATT ZABA',
- 'MATTHEW HEWITT',
- "MATTHEW O'CONNOR",
- 'MAXIME LAGACE',
- 'MICHAEL DIPIETRO',
- 'MICHAEL GARTEIG',
- 'MICHAEL HOUSER',
- 'MICHAEL HUTCHINSON',
- 'MICHAEL LEE',
- 'MICHAEL LEIGHTON',
- 'MICHAEL MCNIVEN',
- 'MICHAEL MOLE',
- 'MICHAEL MORRISON',
- 'MICHAEL WALL',
- 'MICHAL NEUVIRTH',
- 'MIIKA WIIKMAN',
- 'MIIKKA KIPRUSOFF',
- 'MIKAEL TELLQVIST',
- 'MIKE BRODEUR',
- 'MIKE CONDON',
- 'MIKE MCKENNA',
- 'MIKE MURPHY',
- 'MIKE SMITH',
- 'MIKKO KOSKINEN',
- 'MIROSLAV SVOBODA',
- 'NATHAN DEOBALD',
- 'NATHAN LAWSON',
- 'NATHAN LIEUWEN',
- 'NATHAN SCHOENFELD',
- 'NICK ELLIS',
- 'NICO DAWS',
- 'NIKKE KOKKO',
- 'NIKLAS BACKSTROM',
- 'NIKLAS LUNDSTROM',
- 'NIKLAS SVEDBERG',
- 'NIKLAS TREUTLE',
- 'NIKOLAI KHABIBULIN',
- 'NOLAN SCHAEFER',
- 'OLIE KOLZIG',
- 'OLLE ERIKSSON EK',
- 'ONDREJ PAVELEC',
- 'OSCAR DANSK',
- 'PASCAL LECLAIRE',
- 'PAT CONACHER',
- 'PATRICK KILLEEN',
- 'PATRICK LALIME',
- 'PAUL DEUTSCH',
- 'PAVEL FRANCOUZ',
- 'PEKKA RINNE',
- 'PETER BUDAJ',
- 'PETER MANNINO',
- 'PETR MRAZEK',
- 'PHEONIX COPLEY',
- 'PHILIPP GRUBAUER',
- 'PHILIPPE DESROSIERS',
- 'PYOTR KOCHETKOV',
- 'RAY EMERY',
- 'RETO BERRA',
- 'RICHARD BACHMAN',
- 'RICK DIPIETRO',
- 'RIKU HELENIUS',
- 'ROB LAURIE',
- 'ROB ZEPP',
- 'ROBB  TALLAS',
- 'ROBBIE TALLAS',
- 'ROBERT MAYER',
- 'ROBERTO LUONGO',
- 'ROBIN LEHNER',
- 'ROMAN WILL',
- 'RYAN LOWE',
- 'RYAN MILLER',
- 'RYAN MUNCE',
- 'RYAN VINZ',
- 'SAM BRITTAIN',
- 'SAM MONTEMBEAULT',
- 'SAMI AITTOKALLIO',
- 'SAMUEL ERSSON',
- 'SAMUEL MONTEMBEAULT',
- 'SAM MONTEMBEAULT',
- 'SCOTT CLEMMENSEN',
- 'SCOTT DARLING',
- 'SCOTT FOSTER',
- 'SCOTT MUNROE',
- 'SCOTT STAJCER',
- 'SCOTT WEDGEWOOD',
- 'SEBASTIEN CARON',
- 'SEMYON VARLAMOV',
- 'SERGEI BOBROVSKY',
- 'SHAWN HUNWICK',
- 'SPENCER KNIGHT',
- 'SPENCER MARTIN',
- 'STEFANOS LEKKAS',
- 'STEVE MASON',
- 'STEVE MICHALEK',
- 'STEVE VALIQUETTE',
- 'STUART SKINNER',
- 'THATCHER DEMKO',
- 'THOMAS FENTON',
- 'THOMAS GREISS',
- 'THOMAS HODGES',
- 'TIM THOMAS',
- 'TIMO PIELMEIER',
- 'TIMOTHY JR. THOMAS',
- 'TOBIAS STEPHAN',
- 'TODD FORD',
- 'TOM MCCOLLUM',
- 'TOMAS POPPERLE',
- 'TOMAS VOKOUN',
- 'TORRIE JUNG',
- 'TRENT MINER',
- 'TRISTAN JARRY',
- 'TROY GROSENICK',
- 'TUUKKA RASK',
- 'TY CONKLIN',
- 'TYLER BUNZ',
- 'TYLER PLANTE',
- 'TYLER STEWART',
- 'TYLER WEIMAN',
- 'TYSON SEXSMITH',
- 'UKKO-PEKKA LUUKKONEN',
- 'VEINI VEHVILAINEN',
- 'VESA TOSKALA',
- 'VIKTOR FASTH',
- 'VILLE HUSSO',
- 'VITEK VANECEK',
- 'WADE DUBIELEWICZ',
- 'YANIV PERETS',
- 'YANN DANIS',
- 'YAROSLAV ASKAROV',
- 'ZACH FUCALE',
- 'ZACH SAWCHENKO',
- 'ZACH SIKICH',
- 'ZACHARY FUCALE',
- 'ZANE KALEMBA',
- 'ZANE MCINTYRE']
+    thisteam = home_soup.find('td', {'align':'center', 'class':'teamHeading + border'}).get_text()
     players = dict()
@@ -985,12 +948,95 @@ def scrape_html_shifts(season, game_id):
         alldf = alldf._append(df)
     home_shifts = alldf
+    home_shifts.to_csv('/Users/patrickbacon/compact_topdownhockey/home_shifts.csv', index = False)
+    if live == True:
+        home_shifts = home_shifts.assign(shift_number = home_shifts.shift_number.astype(int))
+        home_shifts = home_shifts.assign(number = home_shifts.number.astype(int))
+        found = home_soup.find_all('td', {'class':['playerHeading + border', 'bborder + lborder +']})
+        if len(found)==0:
+            raise IndexError('This game has no shift data.')
+        thisteam = home_soup.find('td', {'align':'center', 'class':'teamHeading + border'}).get_text()
+        players = dict()
+        for i in range(len(found)):
+            line = found[i].get_text()
+            if line == '25 PETTERSSON, ELIAS':
+                line = '25 PETTERSSON(D), ELIAS'
+            if ', ' in line:
+                name = line.split(',')
+                number = name[0].split(' ')[0].strip()
+                last_name =  name[0].split(' ')[1].strip()
+                first_name = name[1].strip()
+                full_name = first_name + " " + last_name
+                players[full_name] = dict()
+                players[full_name]['number'] = number
+                players[full_name]['name'] = full_name
+                players[full_name]['shifts'] = []
+            else:
+                players[full_name]['shifts'].extend([line])
+        alldf = pd.DataFrame()
+        for key in players.keys():
+            length = length = int(len(players[key]['shifts'])/6)
+            df = df = pd.DataFrame(np.array((players[key]['shifts'])).reshape(length, 6)).rename(
+            columns = {0:'period', 1:'shifts', 2:'avg', 3:'TOI', 4:'EV Total', 5:'PP Total'})
+            df = df.assign(name = players[key]['name'],
+                          number = players[key]['number'],
+                          team = thisteam,
+                          venue = "home")
+            alldf = alldf._append(df)
+        home_extra_shifts = alldf
+        shifts_needing_to_be_added = home_extra_shifts[home_extra_shifts.shifts=='0']
+        def subtract_from_twenty_minutes(time_string):
+            # Parse the input time string
+            minutes, seconds = map(int, time_string.split(':'))
+            # Convert to total seconds
+            input_seconds = minutes * 60 + seconds
+            twenty_minutes_seconds = 20 * 60  # 1200 seconds
+            # Calculate the difference
+            difference_seconds = twenty_minutes_seconds - input_seconds
+            # Convert back to MM:SS format
+            result_minutes = difference_seconds // 60
+            result_seconds = difference_seconds % 60
+            # Format the result
+            return f"{result_minutes}:{result_seconds:02d}"
+        shifts_needing_to_be_added = shifts_needing_to_be_added.assign(shift_start = '0:00 / ' + shifts_needing_to_be_added.TOI,
+                                     shift_end = shifts_needing_to_be_added.TOI +  ' / ' + shifts_needing_to_be_added.TOI.apply(lambda x: subtract_from_twenty_minutes(x)),
+                                     duration = shifts_needing_to_be_added.TOI)
+        shifts_needing_to_be_added = shifts_needing_to_be_added.merge(
+        home_shifts.assign(shift_number = home_shifts.shift_number.astype(int)).groupby('name')['shift_number'].max().reset_index().rename(columns = {'shift_number':'prior_max_shift'})
+        )
+        shifts_needing_to_be_added = shifts_needing_to_be_added.assign(shift_number = shifts_needing_to_be_added.prior_max_shift + 1)
+        shifts_needing_to_be_added = shifts_needing_to_be_added.loc[:, ['shift_number', 'period', 'shift_start', 'shift_end', 'duration', 'name', 'number', 'team', 'venue']]
+        shifts_needing_to_be_added['number'] = shifts_needing_to_be_added['number'].astype(int)
+        home_shifts = pd.concat([home_shifts, shifts_needing_to_be_added]).sort_values(by = ['number', 'period', 'shift_number'])
     url = 'http://www.nhl.com/scores/htmlreports/' + season + '/TV0' + game_id + '.HTM'
     page = (requests.get(url))
-    soup = BeautifulSoup(page.content.decode('ISO-8859-1'), 'lxml', multi_valued_attributes = None)
-    found = soup.find_all('td', {'class':['playerHeading + border', 'lborder + bborder']})
-    thisteam = soup.find('td', {'align':'center', 'class':'teamHeading + border'}).get_text()
+    away_soup = BeautifulSoup(page.content)
+    found = away_soup.find_all('td', {'class':['playerHeading + border', 'lborder + bborder']})
+    if len(found)==0:
+        raise IndexError('This game has no shift data.')
+    thisteam = away_soup.find('td', {'align':'center', 'class':'teamHeading + border'}).get_text()
     players = dict()
@@ -1022,12 +1068,163 @@ def scrape_html_shifts(season, game_id):
                       team = thisteam,
                       venue = "away")
         alldf = alldf._append(df)
     away_shifts = alldf
+    away_shifts.to_csv('/Users/patrickbacon/compact_topdownhockey/away_shifts.csv', index = False)
+    if live == True:
+        away_shifts = away_shifts.assign(shift_number = away_shifts.shift_number.astype(int))
+        away_shifts = away_shifts.assign(number = away_shifts.number.astype(int))
+        found = away_soup.find_all('td', {'class':['playerHeading + border', 'bborder + lborder +']})
+        if len(found)==0:
+            raise IndexError('This game has no shift data.')
+        thisteam = away_soup.find('td', {'align':'center', 'class':'teamHeading + border'}).get_text()
+        players = dict()
+        for i in range(len(found)):
+            line = found[i].get_text()
+            if line == '25 PETTERSSON, ELIAS':
+                line = '25 PETTERSSON(D), ELIAS'
+            if ', ' in line:
+                name = line.split(',')
+                number = name[0].split(' ')[0].strip()
+                last_name =  name[0].split(' ')[1].strip()
+                first_name = name[1].strip()
+                full_name = first_name + " " + last_name
+                players[full_name] = dict()
+                players[full_name]['number'] = number
+                players[full_name]['name'] = full_name
+                players[full_name]['shifts'] = []
+            else:
+                players[full_name]['shifts'].extend([line])
+        alldf = pd.DataFrame()
+        for key in players.keys():
+            length = length = int(len(players[key]['shifts'])/6)
+            df = df = pd.DataFrame(np.array((players[key]['shifts'])).reshape(length, 6)).rename(
+            columns = {0:'period', 1:'shifts', 2:'avg', 3:'TOI', 4:'EV Total', 5:'PP Total'})
+            df = df.assign(name = players[key]['name'],
+                          number = players[key]['number'],
+                          team = thisteam,
+                          venue = "away")
+            alldf = alldf._append(df)
+        away_extra_shifts = alldf
+        shifts_needing_to_be_added = away_extra_shifts[away_extra_shifts.shifts=='0']
+        def subtract_from_twenty_minutes(time_string):
+            # Parse the input time string
+            minutes, seconds = map(int, time_string.split(':'))
+            # Convert to total seconds
+            input_seconds = minutes * 60 + seconds
+            twenty_minutes_seconds = 20 * 60  # 1200 seconds
+            # Calculate the difference
+            difference_seconds = twenty_minutes_seconds - input_seconds
+            # Convert back to MM:SS format
+            result_minutes = difference_seconds // 60
+            result_seconds = difference_seconds % 60
+            # Format the result
+            return f"{result_minutes}:{result_seconds:02d}"
+        shifts_needing_to_be_added = shifts_needing_to_be_added.assign(shift_start = '0:00 / ' + shifts_needing_to_be_added.TOI.astype(str),
+                                 shift_end = shifts_needing_to_be_added.TOI.astype(str) +  ' / ' + shifts_needing_to_be_added.TOI.apply(lambda x: subtract_from_twenty_minutes(x)),
+                                 duration = shifts_needing_to_be_added.TOI.astype(str))
+        shifts_needing_to_be_added = shifts_needing_to_be_added.merge(
+            away_shifts.assign(shift_number = away_shifts.shift_number.astype(int)).groupby('name')['shift_number'].max().reset_index().rename(columns = {'shift_number':'prior_max_shift'})
+        )
+        shifts_needing_to_be_added = shifts_needing_to_be_added.assign(shift_number = shifts_needing_to_be_added.prior_max_shift + 1)
+        shifts_needing_to_be_added = shifts_needing_to_be_added.loc[:, ['shift_number', 'period', 'shift_start', 'shift_end', 'duration', 'name', 'number', 'team', 'venue']]
+        shifts_needing_to_be_added['number'] = shifts_needing_to_be_added['number'].astype(int)
+        away_shifts = pd.concat([away_shifts, shifts_needing_to_be_added]).sort_values(by = ['number', 'period', 'shift_number'])
+        # Additional logic to handle period 1 scrape when we don't have goalie shifts yet.
+        if len(home_shifts[(home_shifts.name.isin(goalie_names))]) == 0 or len(away_shifts[(away_shifts.name.isin(goalie_names))]):
+            pbp_html_url = f'https://www.nhl.com/scores/htmlreports/{season}/GS0{game_id}.HTM'
+            pbp_soup = BeautifulSoup(requests.get(pbp_html_url).content)
+            goalie_header = pbp_soup.find('td', text='GOALTENDER SUMMARY')
+            # Navigate to the table containing goalie data
+            goalie_table = goalie_header.find_next('table')
+            away_teams = pd.read_html(str(goalie_table))[0][:2]
+            away_team = away_teams[0].iloc[0]
+            away_goalies = pd.read_html(str(goalie_table))[0][2:4]
+            away_goalies = away_goalies[~pd.isna(away_goalies[6])]
+            away_goalies = away_goalies.assign(team = away_team).rename(columns = {0:'number', 2:'name', 6:'TOI'}).loc[:, ['number', 'name', 'TOI', 'team']]
+            home_teams = pd.read_html(str(goalie_table))[0][6:7]
+            home_team = home_teams[0].iloc[0]
+            home_goalies = pd.read_html(str(goalie_table))[0][8:10]
+            home_goalies = home_goalies[~pd.isna(home_goalies[6])]
+            home_goalies = home_goalies.assign(team = home_team).rename(columns = {0:'number', 2:'name', 6:'TOI'}).loc[:, ['number', 'name', 'TOI', 'team']]
+            home_goalies = pd.read_html(str(goalie_table))[0][8:9]
+            # Temporary to test. Will fix later.
+            # home_goalies = home_goalies.assign(TOI = '11:26')
+            # away_goalies = away_goalies.assign(TOI = '11:26')
+        if len(home_shifts[(home_shifts.name.isin(goalie_names))]) == 0:
+            home_goalie_shift = home_goalies.assign(shift_number = 1,
+                                period = 1,
+                                name = home_goalies.name.str.split(', ').str[1] + ' ' + home_goalies.name.str.split(', ').str[0],
+                               shift_start = '0:00 / 20:00',
+                               shift_end = home_goalies.TOI + ' / ' + home_goalies.TOI.apply(lambda x: subtract_from_twenty_minutes(x)),
+                               duration = home_goalies.TOI,
+                               venue = 'home').loc[
+            :, ['shift_number', 'period', 'shift_start', 'shift_end', 'duration', 'name', 'number', 'team', 'venue']]
+            home_goalie_shift = home_goalie_shift.assign(period = home_goalie_shift.period.astype(int),
+                                shift_number = home_goalie_shift.shift_number.astype(int),
+                                number = home_goalie_shift.number.astype(int))
+            home_shifts = pd.concat([home_shifts, home_goalie_shift]).sort_values(by = ['number', 'period', 'shift_number'])
+        if len(away_shifts[(away_shifts.name.isin(goalie_names))]) == 0:
+            away_goalie_shift = away_goalies.assign(shift_number = 1,
+                                period = 1,
+                                name = away_goalies.name.str.split(', ').str[1] + ' ' + away_goalies.name.str.split(', ').str[0],
+                               shift_start = '0:00 / 20:00',
+                               shift_end = away_goalies.TOI + ' / ' + away_goalies.TOI.apply(lambda x: subtract_from_twenty_minutes(x)),
+                               duration = away_goalies.TOI,
+                               venue = 'away').loc[
+            :, ['shift_number', 'period', 'shift_start', 'shift_end', 'duration', 'name', 'number', 'team', 'venue']]
+            away_goalie_shift = away_goalie_shift.assign(period = away_goalie_shift.period.astype(int),
+                                shift_number = away_goalie_shift.shift_number.astype(int),
+                                number = away_goalie_shift.number.astype(int))
+            away_shifts = pd.concat([away_shifts, away_goalie_shift]).sort_values(by = ['number', 'period', 'shift_number'])
     global all_shifts
     all_shifts = pd.concat([home_shifts, away_shifts])
+    #all_shifts.to_csv('/Users/patrickbacon/compact_topdownhockey/all_shifts.csv', index = False)
     all_shifts = all_shifts.assign(start_time = all_shifts.shift_start.str.split('/').str[0])
@@ -1232,8 +1429,20 @@ def scrape_html_shifts(season, game_id):
     all_shifts['name'] = all_shifts['name'].str.normalize('NFKD').str.encode('ascii', errors='ignore').str.decode('utf-8').str.upper()
+    # Apply regex to remove (A) and (C) designations at end of names
+    all_shifts['name'] = all_shifts['name'].apply(lambda x: re.sub(r' \(A\)$', '', x).strip())
+    all_shifts['name'] = all_shifts['name'].apply(lambda x: re.sub(r' \(C\)$', '', x).strip())
+    # Apply specific name corrections
     all_shifts['name'] = np.where(all_shifts['name']== "JURAJ SLAFKOVSKA" , "JURAJ SLAFKOVSKY", all_shifts['name']) # Need to do this after normalization, only then he becomes Slafkovska?
+    all_shifts['name'] = np.where(all_shifts['name']== "JOHN (JACK) ROSLOVIC" , "JACK ROSLOVIC", all_shifts['name'])
+    all_shifts['name'] = np.where(all_shifts['name']== "ANTHONY-JOHN (AJ) GREER" , "A.J. GREER", all_shifts['name'])
+    all_shifts['name'] = np.where(all_shifts['name']== 'MARTIN FEHARVARY' , 'MARTIN FEHERVARY', all_shifts['name'])
+    all_shifts['name'] = np.where(all_shifts['name']== 'MATAJ  BLAMEL' , 'MATAJ BLAMEL', all_shifts['name'])
+    all_shifts['name'] = all_shifts['name'].str.replace('  ', ' ')
     all_shifts = all_shifts.assign(end_time = np.where(pd.to_datetime(all_shifts.start_time).dt.time > pd.to_datetime(all_shifts.end_time).dt.time, '20:00', all_shifts.end_time),
                                   goalie = np.where(all_shifts.name.isin(goalie_names), 1, 0))
@@ -1265,10 +1474,16 @@ def scrape_html_shifts(season, game_id):
     global changes_on
     global changes_off
     myshifts = all_shifts
+    #myshifts.to_csv('/Users/patrickbacon/compact_topdownhockey/tmp.csv', index = False)
+    #print('Printing my shifts')
+    #print(myshifts)
     myshifts.start_time = myshifts.start_time.str.strip()
     myshifts.end_time = myshifts.end_time.str.strip()
+    myshifts['number'] = myshifts.number.astype(str)
     changes_on = myshifts.groupby(['team', 'period', 'start_time']).agg(
         on = ('name', ', '.join),
         on_numbers = ('number', ', '.join),
@@ -1293,6 +1508,8 @@ def scrape_html_shifts(season, game_id):
                           3900))
     full_changes = full_changes.assign(team = np.where(full_changes.team=='CANADIENS MONTREAL', 'MONTREAL CANADIENS', full_changes.team))
+    full_changes = full_changes.assign(team = np.where(full_changes.team=='MONTRÉAL CANADIENS', 'MONTREAL CANADIENS', full_changes.team))
     return full_changes.reset_index(drop = True)#.drop(columns = ['time', 'period_seconds'])
@@ -1559,7 +1776,20 @@ def scrape_api_events(game_id, drop_description = True, shift_to_espn = False):
         api_events['ep1_name'] = api_events['ep1_name'].str.normalize('NFKD').str.encode('ascii', errors='ignore').str.decode('utf-8').str.upper()
+        # Apply regex to remove (A) and (C) designations at end of names
+        api_events['ep1_name'] = api_events['ep1_name'].apply(lambda x: re.sub(r' \(A\)$', '', x).strip())
+        api_events['ep1_name'] = api_events['ep1_name'].apply(lambda x: re.sub(r' \(C\)$', '', x).strip())
+        # Apply specific name corrections
         api_events['ep1_name'] = np.where(api_events['ep1_name'] == "JURAJ SLAFKOVSKA" , "JURAJ SLAFKOVSKY", api_events['ep1_name']) # Need to do this after normalization, only then he becomes Slafkovska?
+        api_events['ep1_name'] = np.where(api_events['ep1_name'] == "JOHN (JACK) ROSLOVIC" , "JACK ROSLOVIC", api_events['ep1_name'])
+        api_events['ep1_name'] = np.where(api_events['ep1_name'] == "ANTHONY-JOHN (AJ) GREER" , "A.J. GREER", api_events['ep1_name'])
+        api_events['ep1_name'] = np.where(api_events['ep1_name'] == 'MARTIN FEHARVARY' , 'MARTIN FEHERVARY', api_events['ep1_name'])
+        api_events['ep1_name'] = np.where(api_events['ep1_name'] == 'MATAJ  BLAMEL' , 'MATAJ BLAMEL', api_events['ep1_name'])
+        api_events['ep1_name'] = api_events['ep1_name'].str.replace('  ', ' ')
         api_events = api_events.assign(ep1_name = np.where(api_events.ep1_name=='ALEX BARRÃ-BOULET', 'ALEX BARRE_BOULET', api_events.ep1_name))
@@ -1679,8 +1909,9 @@ def scrape_html_events(season, game_id):
                                                        game.home_team_abbreviated.iloc[0],
                                                       game.away_team_abbreviated.iloc[0]))
-    roster = roster.assign(teamnum = roster.team_abbreviated + roster['#'],
-                          Name = roster.Name.str.split('(').str[0].str.strip())
+    roster = roster.assign(teamnum = roster.team_abbreviated + roster['#'])
+    roster['Name'] = roster.Name.apply(lambda x: re.sub(r' \(A\)$', '', x).strip())
+    roster['Name'] = roster.Name.apply(lambda x: re.sub(r' \(C\)$', '', x).strip())
     event_player_1s = roster.loc[:, ['teamnum', 'Name']].rename(columns = {'teamnum':'event_player_1', 'Name':'ep1_name'})
     event_player_2s = roster.loc[:, ['teamnum', 'Name']].rename(columns = {'teamnum':'event_player_2', 'Name':'ep2_name'})
@@ -1743,6 +1974,9 @@ def scrape_html_events(season, game_id):
     game = game.assign(home_team = np.where(game.home_team=='CANADIENS MONTREAL', 'MONTREAL CANADIENS', game.home_team),
                       away_team = np.where(game.away_team=='CANADIENS MONTREAL', 'MONTREAL CANADIENS', game.away_team))
+    game = game.assign(home_team = np.where(game.home_team=='MONTRÉAL CANADIENS', 'MONTREAL CANADIENS', game.home_team),
+                      away_team = np.where(game.away_team=='MONTRÉAL CANADIENS', 'MONTREAL CANADIENS', game.away_team))
     if int(game_id[0])!=3:
         game = game[game.game_seconds<4000]
@@ -1940,7 +2174,8 @@ def scrape_espn_events(espn_game_id, drop_description = True):
     (np.where(espn_events['event_player_1']== "EMIL LILLEBERG" , "EMIL MARTINSEN LILLEBERG",
     (np.where(espn_events['event_player_1']== "CAMERON ATKINSON" , "CAM ATKINSON",
     (np.where(espn_events['event_player_1']== "JURAJ SLAFKOVSKA" , "JURAJ SLAFKOVSKY",
-    espn_events['event_player_1']))))))))))))))))))))))))))))))))))
+    (np.where(espn_events['event_player_1']== "MARTIN FEHARVARY" , "MARTIN FEHERVARY",
+    espn_events['event_player_1']))))))))))))))))))))))))))))))))))))
     espn_events = espn_events.assign(version =
@@ -1974,8 +2209,21 @@ def scrape_espn_events(espn_game_id, drop_description = True):
     espn_events['event_player_1'] = espn_events['event_player_1'].str.normalize('NFKD').str.encode('ascii', errors='ignore').str.decode('utf-8').str.upper()
-    espn_events['event_player_1'] = np.where(espn_events['event_player_1'] == "JURAJ SLAFKOVSKA" , "JURAJ SLAFKOVSKY", espn_events['event_player_1'])
+    # Apply regex to remove (A) and (C) designations at end of names
+    espn_events['event_player_1'] = espn_events['event_player_1'].apply(lambda x: re.sub(r' \(A\)$', '', x).strip())
+    espn_events['event_player_1'] = espn_events['event_player_1'].apply(lambda x: re.sub(r' \(C\)$', '', x).strip())
+    # Apply specific name corrections
+    espn_events['event_player_1'] = np.where(espn_events['event_player_1'] == "JURAJ SLAFKOVSKA" , "JURAJ SLAFKOVSKY", espn_events['event_player_1'])
+    espn_events['event_player_1'] = np.where(espn_events['event_player_1'] == "JOHN (JACK) ROSLOVIC" , "JACK ROSLOVIC", espn_events['event_player_1'])
+    espn_events['event_player_1'] = np.where(espn_events['event_player_1'] == "ANTHONY-JOHN (AJ) GREER" , "A.J. GREER", espn_events['event_player_1'])
+    espn_events['event_player_1'] = np.where(espn_events['event_player_1'] == 'MARTIN FEHARVARY' , 'MARTIN FEHERVARY', espn_events['event_player_1'])
+    espn_events['event_player_1'] = np.where(espn_events['event_player_1'] == 'MATAJ  BLAMEL' , 'MATAJ BLAMEL', espn_events['event_player_1'])
+    espn_events['event_player_1'] = espn_events['event_player_1'].str.replace('  ', ' ')
     #espn_events = espn_events.assign(event_player_1 = np.where(
     #espn_events.event_player_1=='ALEX BURROWS', 'ALEXANDRE BURROWS', espn_events.event_player_1))
@@ -2007,6 +2255,7 @@ def scrape_espn_ids_single_game(game_date, home_team, away_team):
     this_date = (game_date)
     url = 'http://www.espn.com/nhl/scoreboard?date=' + this_date.replace("-", "")
     page = requests.get(url, headers={'User-Agent': 'Mozilla/5.0'}, timeout = 500)
+    print('Request to ESPN IDs successful.')
     soup = BeautifulSoup(page.content, parser = 'lxml')
     soup_found = soup.find_all('a', {'class':['AnchorLink truncate',
                              'AnchorLink Button Button--sm Button--anchorLink Button--alt mb4 w-100',
@@ -2075,9 +2324,11 @@ def scrape_espn_ids_single_game(game_date, home_team, away_team):
                     np.where(gamedays.away_team=='AVALANCHE', 'COL',
                     np.where(gamedays.away_team=='BLUE', 'CBJ',
                     np.where(gamedays.away_team=='JACKETS', 'CBJ',
+                    np.where(gamedays.away_team=='BLUE JACKETS', 'CBJ',
                     np.where(gamedays.away_team=='STARS', 'DAL',
                     np.where(gamedays.away_team=='RED', 'DET',
                     np.where(gamedays.away_team=='WINGS', 'DET',
+                    np.where(gamedays.away_team=='RED WINGS', 'DET',
                     np.where(gamedays.away_team=='OILERS', 'EDM',
                     np.where(gamedays.away_team=='PANTHERS', 'FLA',
                     np.where(gamedays.away_team=='KINGS', 'LAK',
@@ -2096,15 +2347,17 @@ def scrape_espn_ids_single_game(game_date, home_team, away_team):
                     np.where(gamedays.away_team=='LIGHTNING', 'TBL',
                     np.where(gamedays.away_team=='LEAFS', 'TOR',
                     np.where(gamedays.away_team=='MAPLE', 'TOR',
+                    np.where(gamedays.away_team=='MAPLE LEAFS', 'TOR',
                     np.where(gamedays.away_team=='CANUCKS', 'VAN',
                     np.where(gamedays.away_team=='GOLDEN', 'VGK',
                     np.where(gamedays.away_team=='KNIGHTS', 'VGK',
+                    np.where(gamedays.away_team=='GOLDEN KNIGHTS', 'VGK',
                     np.where(gamedays.away_team=='CAPITALS', 'WSH',
                     np.where(gamedays.away_team=='JETS', 'WPG',
                     np.where(gamedays.away_team=='CLUB', 'UTA',
+                    np.where(gamedays.away_team=='MAMMOTH', 'UTA',
                     np.where(gamedays.away_team=='HOCKEY', 'UTA', 'mistake'
-                            ))))))))))))))))))))))))))))))))))))))
-    )
+                            ))))))))))))))))))))))))))))))))))))))))))))
     gamedays = gamedays.assign(
         home_team = np.where(gamedays.home_team=='DUCKS', 'ANA',
@@ -2117,9 +2370,11 @@ def scrape_espn_ids_single_game(game_date, home_team, away_team):
                     np.where(gamedays.home_team=='AVALANCHE', 'COL',
                     np.where(gamedays.home_team=='BLUE', 'CBJ',
                     np.where(gamedays.home_team=='JACKETS', 'CBJ',
+                    np.where(gamedays.home_team=='BLUE JACKETS', 'CBJ',
                     np.where(gamedays.home_team=='STARS', 'DAL',
                     np.where(gamedays.home_team=='RED', 'DET',
                     np.where(gamedays.home_team=='WINGS', 'DET',
+                    np.where(gamedays.home_team=='RED WINGS', 'DET',
                     np.where(gamedays.home_team=='OILERS', 'EDM',
                     np.where(gamedays.home_team=='PANTHERS', 'FLA',
                     np.where(gamedays.home_team=='KINGS', 'LAK',
@@ -2138,15 +2393,17 @@ def scrape_espn_ids_single_game(game_date, home_team, away_team):
                     np.where(gamedays.home_team=='LIGHTNING', 'TBL',
                     np.where(gamedays.home_team=='MAPLE', 'TOR',
                     np.where(gamedays.home_team=='LEAFS', 'TOR',
+                    np.where(gamedays.home_team=='MAPLE LEAFS', 'TOR',
                     np.where(gamedays.home_team=='CANUCKS', 'VAN',
                     np.where(gamedays.home_team=='GOLDEN', 'VGK',
                     np.where(gamedays.home_team=='KNIGHTS', 'VGK',
+                    np.where(gamedays.home_team=='GOLDEN KNIGHTS', 'VGK',
                     np.where(gamedays.home_team=='CAPITALS', 'WSH',
                     np.where(gamedays.home_team=='JETS', 'WPG',
                     np.where(gamedays.home_team=='CLUB', 'UTA',
+                    np.where(gamedays.home_team=='MAMMOTH', 'UTA',
                     np.where(gamedays.home_team=='HOCKEY', 'UTA', 'mistake'
-                            ))))))))))))))))))))))))))))))))))))))
-    )
+                            ))))))))))))))))))))))))))))))))))))))))))))
     gamedays = gamedays[(gamedays.game_date==this_date) & (gamedays.home_team==home_team) & (gamedays.away_team==away_team)]
@@ -2159,9 +2416,23 @@ def merge_and_prepare(events, shifts):
     game_id = int(events.game_id.iloc[0])
     merged = pd.concat([events, shifts])
+    home_team = merged[~(pd.isna(merged.home_team))].home_team.iloc[0]
+    #print(home_team)
+    away_team = merged[~(pd.isna(merged.away_team))].away_team.iloc[0]
+    #print(away_team)
+    if 'CANADIENS' in home_team:
+        home_team = 'MONTREAL CANADIENS'
+    if 'CANADIENS' in away_team:
+        away_team = 'MONTREAL CANADIENS'
+    #print(home_team)
+    #print(away_team)
-    merged = merged.assign(home_team = merged[~(pd.isna(merged.home_team))].home_team.iloc[0],
-                          away_team = merged[~(pd.isna(merged.away_team))].away_team.iloc[0],
+    merged = merged.assign(home_team = home_team,
+                          away_team = away_team,
                           home_team_abbreviated = merged[~(pd.isna(merged.home_team_abbreviated))].home_team_abbreviated.iloc[0],
                           away_team_abbreviated = merged[~(pd.isna(merged.away_team_abbreviated))].away_team_abbreviated.iloc[0])
@@ -2211,6 +2482,8 @@ def merge_and_prepare(events, shifts):
                                           np.where(merged.event.isin(['PGSTR', 'PGEND', 'PSTR', 'PEND', 'ANTHEM']), -1, 1))).sort_values(
         by = ['game_seconds', 'period', 'event_index'])
+    merged.to_csv('/Users/patrickbacon/compact_topdownhockey/first_merged.csv', index = False)
     merged = merged.assign(change_before_event = np.where(
         (
             (merged.away_on_ice!='') & (merged.event.shift()=='CHANGE') & (merged.away_on_ice!=merged.away_on_ice.shift()) |
@@ -2242,8 +2515,9 @@ def merge_and_prepare(events, shifts):
                                                        merged.home_team_abbreviated.iloc[0],
                                                       merged.away_team_abbreviated.iloc[0]))
-    roster = roster.assign(teamnum = roster.team_abbreviated + roster['#'],
-                          Name = roster.Name.str.split('(').str[0].str.strip())
+    roster = roster.assign(teamnum = roster.team_abbreviated + roster['#'])
+    roster['Name'] = roster.Name.apply(lambda x: re.sub(r' \(A\)$', '', x).strip())
+    roster['Name'] = roster.Name.apply(lambda x: re.sub(r' \(C\)$', '', x).strip())
     roster = roster.assign(Name = np.where((roster.Name=='SEBASTIAN AHO') &( roster.team_name == 'NEW YORK ISLANDERS'), 'SEBASTIAN AHO (SWE)', roster.Name))
     roster = roster.assign(Name = np.where((roster.Name=='ELIAS PETTERSSON') &( roster.Pos == 'D'), 'ELIAS PETTERSSON(D)', roster.Name))
@@ -2562,7 +2836,7 @@ def fix_missing(single, event_coords, events):
     return(events)
-def full_scrape_1by1(game_id_list, shift_to_espn = True):
+def full_scrape_1by1(game_id_list, live = False, shift_to_espn = True):
     global single
     global event_coords
@@ -2585,7 +2859,9 @@ def full_scrape_1by1(game_id_list, shift_to_espn = True):
             print('Attempting scrape for: ' + str(game_id))
             season = str(int(str(game_id)[:4])) + str(int(str(game_id)[:4]) + 1)
             small_id = str(game_id)[5:]
+            print('Scraping HTML events')
             single = scrape_html_events(season, small_id)
+            print('Scraped HTML events')
             single['game_id'] = int(game_id)
             # If all goes well with the HTML scrape:
@@ -2604,7 +2880,7 @@ def full_scrape_1by1(game_id_list, shift_to_espn = True):
                     print('Issue when fixing problematic events. Here it is: ' + str(e))
                     continue
                 try:
-                    shifts = scrape_html_shifts(season, small_id)
+                    shifts = scrape_html_shifts(season, small_id, live)
                     finalized = merge_and_prepare(events, shifts)
                     full = full._append(finalized)
                     second_time = time.time()
@@ -2632,8 +2908,29 @@ def full_scrape_1by1(game_id_list, shift_to_espn = True):
                     home_team = single['home_team_abbreviated'].iloc[0]
                     away_team = single['away_team_abbreviated'].iloc[0]
                     game_date = single['game_date'].iloc[0]
+                    espn_home_team = home_team
+                    espn_away_team = away_team
                     try:
-                        espn_id = scrape_espn_ids_single_game(str(game_date.date()), home_team, away_team).espn_id.iloc[0]
+                        if home_team == 'T.B':
+                            espn_home_team = 'TBL'
+                        if away_team == 'T.B':
+                            espn_away_team = 'TBL'
+                        if home_team == 'L.A':
+                            espn_home_team = 'LAK'
+                        if away_team == 'L.A':
+                            espn_away_team = 'LAK'
+                        if home_team == 'N.J':
+                            espn_home_team = 'NJD'
+                        if away_team == 'N.J':
+                            espn_away_team = 'NJD'
+                        if home_team == 'S.J':
+                            espn_home_team = 'SJS'
+                        if away_team == 'S.J':
+                            espn_away_team = 'SJS'
+                        print('Scraping ESPN IDs')
+                        espn_id = scrape_espn_ids_single_game(str(game_date.date()), espn_home_team, espn_away_team).espn_id.iloc[0]
+                        print('Scraping ESPN Events')
+                        print('Here is the ESPN ID': espn_id)
                         event_coords = scrape_espn_events(int(espn_id))
                         event_coords['coordinate_source'] = 'espn'
                         events = single.merge(event_coords, on = ['event_player_1', 'game_seconds', 'period', 'version', 'event'], how = 'left').drop(columns = ['espn_id'])
@@ -2646,7 +2943,7 @@ def full_scrape_1by1(game_id_list, shift_to_espn = True):
                         print('This game does not have ESPN or API coordinates. You will get it anyway, though.')
                         events = single
                     try:
-                        shifts = scrape_html_shifts(season, small_id)
+                        shifts = scrape_html_shifts(season, small_id, live)
                         finalized = merge_and_prepare(events, shifts)
                         full = full._append(finalized)
                         second_time = time.time()
@@ -2739,7 +3036,7 @@ def full_scrape_1by1(game_id_list, shift_to_espn = True):
                             events = single
                             events['coordinate_source'] = 'none'
                     try:
-                        shifts = scrape_html_shifts(season, small_id)
+                        shifts = scrape_html_shifts(season, small_id, live)
                         finalized = merge_and_prepare(events, shifts)
                         full = full._append(finalized)
                         second_time = time.time()
@@ -2895,12 +3192,50 @@ def full_scrape_1by1(game_id_list, shift_to_espn = True):
     return full
-def full_scrape(game_id_list, shift = False):
+def full_scrape(game_id_list, live = True, shift = False):
     global hidden_patrick
     hidden_patrick = 0
-    df = full_scrape_1by1(game_id_list, shift_to_espn = shift)
+    df = full_scrape_1by1(game_id_list, live, shift_to_espn = shift)
+    # Fixing the Pettersson issue for event player. Just going downstream for this.
+    try:
+        df = df.assign(
+            event_player_1 = np.where(
+                (df.event_player_1 == 'ELIAS PETTERSSON') &
+                (df.event_description.str.contains('#', na=False)) &
+                (df.event_description.str.contains(' PETTERSSON', na=False)) &
+                (df.event_description.str.extract(r'#(\d+) PETTERSSON', expand=False) == '25'),
+                'ELIAS PETTERSSON(D)', df.event_player_1),
+            event_player_2 = np.where(
+                (df.event_player_2 == 'ELIAS PETTERSSON') &
+                (
+                    # Goal and Petey got A1
+                    ((df.event_type == 'GOAL') &
+                    (df.event_description.str.contains(': #', na=False)) &
+                    (df.event_description.str.contains(' PETTERSSON', na=False)) &
+                    (df.event_description.str.extract(r': #(\d+) PETTERSSON', expand=False) == '25')) |
+                    # Not a goal, Petey was EP2
+                    ((df.event_type != 'GOAL') &
+                    (df.event_description.str.contains('VAN #', na=False)) &
+                    (df.event_description.str.contains(' PETTERSSON', na=False)) &
+                    (df.event_description.str.extract(r'VAN #(\d+) PETTERSSON', expand=False) == '25'))
+                ),
+                'ELIAS PETTERSSON(D)', df.event_player_2),
+            event_player_3 = np.where(
+                (df.event_player_3=='ELIAS PETTERSSON') &
+                (df.event_description.str.contains('#', na=False)) &
+                (df.event_description.str.contains(' PETTERSSON', na=False)) &
+                (df.event_description.str.extract(r'#(\d+) PETTERSSON(?:\s|$)', expand=False) == '25'),
+                'ELIAS PETTERSSON(D)', df.event_player_3)
+        )
+    except Exception as e:
+        print(e)
+        continue
+    # Don't even need this, we've had this problem with Stutzle for years, just let it be.
+    # df.event_description = df.event_description.str.replace('FEHÃ\x89RVÃ\x81RY', 'FEHERVARY').str.replace('BLÃMEL', 'BLAMEL')
     if (hidden_patrick==0) and (len(df)>0):