Editing Green Arrow (section)

===Judd Winick, 2004–2008===
[[Judd Winick]] took over as ''Green Arrow''{{'}}s writer and made many changes. [[Mia Dearden]], the new Speedy, was revealed to be HIV positive, and attempts were made to expand Green Arrow's Rogues Gallery with [[Merlyn (DC Comics)|Merlyn]] the archer, [[Constantine Drakon]], as well as Danny Brickwell (the [[Brick (comics)|Brick]]) joining the cast of existing Green Arrow villains such as the illusion-casting [[Count Vertigo]] and the enigmatic [[Onomatopoeia (comics)|Onomatopoeia]], the latter of whom, himself, was a relatively recent addition. Other DC villains, such as the [[Riddler]], made guest appearances throughout his run.

2006 saw the title (along with other DC comics titles) jump "[[One Year Later]]" after the events in ''[[Infinite Crisis]]''. Oliver, having once again amassed a large personal fortune, is the newly elected mayor of Star City, continuing his fight for justice both on the streets and within the political system.<ref>''Green Arrow'' (vol. 3) No. 60 (May 2006)</ref> He also has a new costume, which appears to be a combination of the classic Neal Adams costume and the Mike Grell ''Longbow Hunters'' costume. In flashbacks, it is revealed that Oliver survived a near-fatal attack during the events of the Infinite Crisis, as well as used his recuperation time to retrain. He works with several expert instructors including a sensei known as [[Natas (comics)|Natas]], who also trained [[Deathstroke]], and becomes proficient in several martial arts including the use of swords, which he makes use of on occasion during this time, and proves that he and his family are now formidable combatants when battling Deathstroke and later Batman's rogue protégé [[Jason Todd]]. He is eventually forced to resign from his position as mayor after a scandal where he learns that he had been secretly funding the [[Outsiders (comics)|Outsiders]], essentially a bounty hunter team at this point in their history, coupled with his uncertain position with the voting public, having never had much more than 50% of the city on his side at a time. Queen is convinced to resign his position in exchange for his successor leaving the various social aid organisations and resources he had established alone, although Ollie was able to beat his opponent by resigning prior to the election and putting someone he trusted in charge of the city.<ref>''Green Arrow'' (vol. 3) No. 75 (August 2007)</ref> The series concluded with Oliver proposing to Dinah ([[Black Canary]]).

In 2007, [[Andy Diggle]] and [[Jock (artist)|Jock]]'s ''[[Green Arrow: Year One]]''<ref>{{Cite book | last=Diggle | first=Andy | title=Green Arrow: Year One | publisher=DC Comics | date=April 2009 | isbn=978-1-4012-1743-3}}</ref> presented the newest official version of his origin. Using concepts from previous iterations, Oliver Queen is a rich, thrill-seeking activist who is attacked, thrown overboard and washes up on an island where he learns of a smuggling operation. Upon witnessing the inhabitants' slave-like living conditions, he begins to take down the smugglers' operation. He eventually returns to civilization changed by his experiences. In the final part of the story, Oliver claims that a mutiny or the actions of a group of heroin dealers could be used as a cover story for what transpired, referencing the original Green Arrow origin story, as well as Mike Grell's version.