The revival of NBC’s hit sitcom Will & Grace had been picked up for a third season, according to Deadline. Producers for the show also announced the previously announced second season will expand from a 13-episode order to 18 episodes.

The show starring Debra Messing, Eric McCormack, Megan Mullally, and Sean Hayes still has two more episodes left in the its current first season back on the air.

Read: THE INSIDE STORY BEHIND THE WILL & GRACE REBOOT

The news of a second season was announced in August of last year, prior to the airing of Season 1.

The 18-episode season two will debut in the fall of 2018. The show’s just-announced third season will also feature 18 episodes and premiere in the fall of 2019.

During season one, audiences have enjoyed guest appearances by past characters, including two-time Tony nominee Harry Connick, Jr. (The Pajama Game, Thou Shalt Not) as Leo and two-time Tony nominee Bobby Cannavale (Mauritius, The Motherf*cker With the Hat) as Vince. The season has also featured guest appearances by Broadway favorites Andrew Rannells, Jane Lynch, Ben Platt, Cheyenne Jackson, and more.