NBC announced some great news for ‘Will and Grace’ fans last night, officially renewing the ‘Will and Grace’ revival series for a third season, in addition to upping the episode count for the previously renewed second season, all before the first season has even wrapped.

With a couple episodes still to air in the first season of the revival, NBC has now upped the episode order for season 2 to 18 episodes which matches the current season’s episode count, while also renewing the series for an additional third season which will also consist of 18 episodes. This news ensures fans that the series will remain on NBC through the 2019-2020 season at the very least