Tom Lenk, who played evil nerd Andrew throughout Buffy's sixth season, has confirmed he will return for season seven.

"I'll be back, and some major, very shocking stuff happens," he told Sci Fi Wire, "and then I'll be doing some more episodes after that."

Joining Tom will be his partner in crime, Danny Strong. "I'm allowed to say he is coming back with me," Lenk said. "We come back from Mexico. They don't really say too much about what happened in Mexico, but there's some funny stuff that we talk about."

After being holed up in the geeks' lair for much of last season, the nerds will be interacting with the regular Buffy cast this time around.

"[Now], I'm getting to work with everybody. We're not just isolated like we were last time. So hanging out with the Scooby Gang is good."