Devon Aoki, Tatsu Yamashiro Devon Aoki, Tatsu Yamashiro

Sin City alum Devin Aoki has been tapped to play DC Comics heroine Katana on Arrow's upcoming third season, has confirmed.

The actress will play Tatsu Yamashiro, a martial arts expert who wields a deadly sword and acts as one of Oliver's (Stephen Amell) mentors through flashbacks. She's also a critical influence on his journey to eventually become The Arrow of present day. Aoki, who will first appear in the season premiere, is set to recur.

PHOTOS: They aren't American?!

The last we saw of Oliver Queen in the past, he had woken up Hong Kong, where he meets Amanda Waller (Cynthia Addai-Robinson) for the first time.

Aoki is also known for her role in 2 Fast 2 Furious.

Arrow returns for its third season on Wednesday, Oct. 8 at 8/7c on The CW.

(Full disclosure: is owned by CBS one of The CW's parent companies.)

Watch This Tonight — See why Deadliest Catch is our editors' pick: