Attention people with eyeballs! You'll be seeing a lot more of Oliver Queen (Stephen Amell) when Arrow returns for Season 7 — like a lot more.

In the new trailer for Season 7, Oliver is having a rough go of it in prison. If he's not dealing with Green Arrow groupies — "You have failed this city!" — he's getting attacked by prisoners who aren't so hot on his vigilante past. One of said attacks happens to take place in the shower — naturally — and we'd like to thank showrunner Beth Schwartz and also God for this scene in advance. Oliver's modesty is protected by some creative camera angles (and FCC regulations), but he's still showing some serious skin while kicking butt.

Stephen Amell, <em>Arrow</em>Stephen Amell, Arrow

In other, less naked, news, a new vigilante has arrived in Star City, and he's actually impersonating the Green Arrow on the streets. The last time someone impersonated Oliver's alter ego, it was for evil purposes, but this trailer seems to paint him as a true vigilante, taking down criminals who lurk the streets. Right now our money is on Roy Harper (Colton Haynes) to be the person beneath the mask since we know Haynes is returning as a series regular this year.

Ruby Rose Will Play Batwoman in the CW's Arrowverse Four-Way Crossover

Elsewhere, we also get our first look at the return of Ricardo Diaz (Kirk Acevedo), who disappeared without a trace in the Season 6 finale. He's threatening Felicity (Emily Bett Ricards) and William (Jack Moore) in a woodland area for some reason (please don't be Lian Yu, please don't be Lian Yu), and Oliver is obviously not around to save them. Distract yourself from panicking about their fate by focusing on the fact that William is wearing a green hoodie, which is just too cute for words. Like father, like son!

Arrow returns Monday, Oct. 15 at 8/7c on The CW.

(Full Disclosure: TV Guide is owned by CBS, one of The CW's parent companies.)