Updated code as of goalie presentation.