Marvel’s vision of New York in its cinematic universe is packed. Deadline is reporting that Silicon Valley star Martin Starr has joined the cast of Jon Watts’s 2017 joint Marvel/Sony production of Spider-Man: Homecoming, starring Tom Holland as the titular superhero who debuted in this year’s Captain America: Civil War.

Aside from Silicon Valley, Starr was also in this year’s Operator which debuted at SXSW as well as comedies like Adventureland, Superbad, and TV shows like Freaks and Geeks and Party Down. He was also in the Marvel Cinematic Universe before, playing Amadeus Cho (or so the movie’s novelization said) in 2008’s The Incredible Hulk that starred Edward Norton as the big green bruiser.

Could Starr actually be reprising his “Amadeus Cho” in Spider-Man: Homecoming? Starr’s character in Hulk was a genius at Culver University (a fictional college in Virginia), but his role was minor and on screen for no more than a few minutes. Because of Peter Parker’s intelligence, it isn’t out of the realm to think he’s friends with other nerds like him.

While it’d be cool if Starr was reprising his bit Hulk part in Homecoming, if it was Amadeus Cho it would be disappointing. Marvel Studios has been in hot water for white-washing its Asian characters on screen, and that it would keep Starr as the Korean-American boy genius Cho, currently the Hulk in Marvel’s ongoing Totally Awesome Hulk is another bad tally for Marvel. And Starr is hilarious! He doesn’t deserve anyone’s scorn.

Starr joins a jam-packed cast featuring Robert Downey Jr. reprising Tony Stark, Michael Keaton, Zendaya, Donald Glover, Michael Barbieri, Kenneth Choi (also a returning MCU actor, from Captain America: The First Avenger), and Marisa Tomei as Aunt May.

Spider-Man: Homecoming releases on July 7, 2017.

Photos via Getty Images / Larry Busacca