Oliver Queen and Felicity Smoak are getting back together after a couple of rough seasons, and it looks as though the 'Olicity' love team is here to stay as suggested by set photos for Season 6, Episode 3 of 'Arrow' where the couple is seen kissing. The upcoming episode titled 'Next of Kin' is also expected to deal with the relationship of Oliver and his son.

The 'Olicity' love story

The budding romance between Oliver and Felicity was once one of the most popular elements of 'Arrow,' but it relied too much on soap-opera type relationship drama which killed a lot of people's goodwill.

However, the set photos for Episode 3 of Season 6 suggest that love will be sweeter the second time around for 'Olicity' and maybe even tie the knot in the coming episodes.

What to expect in Episode 3

In 'Next of Kin,' the team will go against Onyx, a DC villain new to the Arrowverse. Additionally, as suggested by the title of the episode, the upcoming installment will tackle the relationship between Oliver and his son. 'Arrow' executive producer Wendy Mericle spoke about a major theme in Season 6 which is Oliver's struggle to come to grips with being a father.

The official synopsis for the upcoming episode expresses that a rogue team headed by Onyx will infiltrate Kord Industries to steal a lethal object.

It also puts forward how Oliver will have trouble connecting with his son, William which leads him to reach out for help from a surprising source. The episode 'Next of Kin' is written by Speed Weed and Oscar Balderrama.

Meanwhile, in an interview, Juliana Harkavy who plays Dinah reveals that they are going to entertain the idea of Diggle taking over as Green Arrow while they figure something else out for Oliver.

Harkavy adds that their positions in the team are going to be realigned and their strengths refocused in order to make things work. Stephen Amell previously hinted about the switch saying there would be a pivotal moment at the end of Episode 2.

A question left unanswered from the previous episode is whether switching from guns to arrows will solve Diggle's problem in the short term or make things worse.

He revealed to Dinah that a shrapnel from the Lian Yu blast had left him with a degenerative neurological condition. Harkavy hints that it could do both..

Season 6, Episode 3 of 'Arrow' airs Thursday night on CW. What do you think the 'Olicity' romance, and Diggle taking over as Green Arrow?