Good news is rolling in for Warner Bros. and DC fans that are still on the wagon. Suicide Squad 2 has found a new director in The Accountant‘s Gavin O’Connor, who will also write a new version of the script.

Much like the way that the original Suicide Squad was plagued with plot holes and endless storylines, the second film in the DC tentpole has been plagued in its early development stages. David Ayer dropped out from returning as director pretty early on (although he is supposedly sticking around for Gotham City Sirens), and made way for names like Jaume Collett-Serra and Mel Gibson to enter the mix. Both of those directors, however, left the shortlist to pursue other projects. While O’Connor is certainly not as buzzy of a name, he already has a working relationship with Warner after directing The Accountant, and will be returning for that sequel as well, which is already in development with Ben Affleck to reprise his role.

Aside from director foibles, Margot Robbie, Jared Leto, and Will Smith are all expected to return in Suicide Squad 2, and now that the script is getting another crack, things are looking up for Warner Bros. Production is not being planned until next fall, but the studio is eager to get a head start on the new film (and hopefully polish it enough to avoid the messy result of the original).