Oliver is eventually joined by his bodyguard, John Diggle , and tech genius Felicity Smoak . Together, they shift from mindless revenge to targeted justice.