Arrow scene help, please.

Does anyone know which episode of Arrow had the scene where Diggle was training Felicity how to fight?

Also desperately want a team!shot of Digg, Felicity, Arrow (and maybe even Sara or Roy if possible). You know those shots where they pan in and they're all just there together fighting the good fight? I'm sure there are some. There have to be.

I need them for a vid. Any help appreciated.
THANK YOU